Commit 1a877ebe authored by Aaron Wells's avatar Aaron Wells Committed by Gerrit Code Review
Browse files

Merge changes I2f7063a8,I186ca634

* changes:
  Bug 1465462: adjusting behat steps to deal with new text
  Bug 1465462: Fixing problem with adding a block via click
parents 4351a700 57ec0785
......@@ -310,23 +310,24 @@
var addblockdialog = $('#addblock');
showDock(addblockdialog, false);
//
// addblockdialog.one('dialog.end', function(event, options) {
// if (options.saved) {
// addNewBlock(options, element.parent().find('.blocktype-radio').val());
// }
// else {
// element.focus();
// }
// });
addblockdialog.one('dialog.end', function(event, options) {
if (options.saved) {
addNewBlock(options, element.find('.blocktype-radio').val());
}
else {
element.focus();
}
});
addblockdialog.find('h4.modal-title').text(get_string('addblock', element.text()));
computeColumnInputs(addblockdialog);
addblockdialog.find('.block-inner').removeClass('hidden');
addblockdialog.find('.cell-chooser input:first').prop('checked', true);
addblockdialog.find('.cell-chooser input:first').parent().addClass('focused active');
addblockdialog.find('.deletebutton').focus();
keytabbinginadialog(addblockdialog, addblockdialog.find('.deletebutton'), addblockdialog.find('.cancel'));
}
......@@ -589,7 +590,7 @@
order = prevcell.children().index(self.closest('.blockinstance')),
row = workspace.find('.js-col-row').index(self.closest('.js-col-row')),
column = self.closest('.js-col-row').children().index(self.closest('.column')),
radio = addblockdialog.find('.cellchooser').children().eq(row).find('input').eq(column),
radio = addblockdialog.find('.cell-chooser').children().eq(row).find('input').eq(column),
changefunction = function() {
if (radio.prop('checked')) {
$('#addblock_position option').eq(order + 1).remove();
......@@ -884,8 +885,7 @@
$('#addblock .submit').on('mousedown keydown', function(e) {
if (isHit(e)) {
var position = $('#addblock .cellchooser input:checked').val().split('-'),
var position = $('#addblock .cell-chooser input:checked').val().split('-'),
order = $('#addblock_position').prop('selectedIndex') + 1;
closePositionBlockDialog(e, {
......@@ -899,7 +899,7 @@
$('#addblock').on('keydown', function(e) {
if (e.keyCode == 13) {
var position = $('#addblock .cellchooser input:checked').val().split('-'),
var position = $('#addblock .cell-chooser input:checked').val().split('-'),
order = $('#addblock_position').prop('selectedIndex') + 1;
closePositionBlockDialog(e, {
......@@ -934,7 +934,7 @@
// Open form here even though it's currently empty (its quicker)
newblock.find('.blockinstance-header').html(get_string('loading'));
if(replaceContent) {
if (replaceContent) {
contentArea.html(content);
} else {
......@@ -944,9 +944,8 @@
// Prevent disappearing scroll bars for interfering with smooth animation
$('body, .navbar-fixed-top').width($('body').width());
$('body').addClass('modal-open modal-open-docked');
newblock.removeClass('closed').addClass('active');
newblock.removeClass('hidden').removeClass('closed').addClass('active');
}
......
......@@ -22,15 +22,15 @@ Scenario Outline: Adding a Note block to a portfolio (Bug 1424512)
And I press "Save"
# Adding a note block
And I expand "General" node
And I wait "2" seconds
And I follow "Note"
And I wait "1" seconds
And I follow "Note" in the "div#general" "css_element"
And I press "Add"
# Configuring the block
And I fill in the following:
| Block title | Note block 1 |
And I press "Save"
And I should see "Note block 1"
And I press "Done"
And I follow "Display page"
# Verifying the Note block saved
And I choose "Notes" in "Content"
And I should see "Note block 1"
......
......@@ -13,11 +13,11 @@ Scenario: Adding tags to files (Bug 1426983)
# Creating a folder with a tag
When I choose "Files" in "Content"
And I set the following fields to these values:
|Folder name | folder1 |
|Create folder | folder1 |
# Pressing create folder button
And I press "Create folder"
# Editing the folder
And I press "edit_6"
And I press "Edit folder \"folder1\""
And I set the following fields to these values:
| Description | This is a subdirectory |
| Tags | folder |
......@@ -52,7 +52,7 @@ Scenario: Adding tags to files (Bug 1426983)
| Page title * | Test page 1 |
| Tags | page, test |
And I press "Save"
And I press "Done"
And I follow "Portfolio"
# Creating page 2 with a tag
And I press "Create page"
And I set the following fields to these values:
......@@ -61,12 +61,13 @@ Scenario: Adding tags to files (Bug 1426983)
And I press "Save"
# Creating a Note with a tag
And I expand "General" node
And I wait until the page is ready
And I follow "Note"
And I wait "1" seconds
And I follow "Note" in the "div#general" "css_element"
And I press "Add"
And I fill in "Tags" with "box, test"
And I press "Save"
And I press "Done"
And I follow "Portfolio"
And I wait "1" seconds
Then I follow "Tags"
# Verifying tags are saved
And I should see "Note"
......
......@@ -14,7 +14,7 @@ Scenario: Accessing annotation block (Bug 1443730)
# Checking if annotation block is there
And I expand "General" node
And I should not see "Annotation"
And I press "Done"
And I follow "Display page"
# Navigating to admin block to turn it on
And I follow "Administration"
And I choose "Plugin administration" in "Extensions"
......@@ -30,6 +30,6 @@ Scenario: Accessing annotation block (Bug 1443730)
And I press "Save"
# Checking that the block saved by using the one thing on the page that changed.
And I should see "Feedback (0)"
And I press "Done"
And I follow "Display page"
And I should see "My page is amazing"
......@@ -39,7 +39,6 @@ Scenario: Creating a page with content in it (Bug 1426983)
And I follow "External media"
And I press "Add"
And I press "Remove"
And I press "Done"
And I follow "Display page"
# Verifying the page saved and is clickable
Then I should see "Test view"
And I follow "Test view"
Then I should see "Test view"
\ No newline at end of file
......@@ -16,7 +16,7 @@ Given the following "users" exist:
And I fill in the following:
| Page title | Sharky |
And I press "Save"
And I press "Done"
And I follow "Display page"
And I follow "Sharky"
And I follow "Place feedback"
# Checking the default settings on the fields are correct
......
......@@ -25,7 +25,7 @@ Scenario: Adding collection to group (Bug 1448807)
| Site Page 01 | 1 |
And I press "Add pages"
And I wait until the page is ready
And I follow "Done"
And I follow "Display page"
And I choose "Shared by me" in "Portfolio"
And I follow "Edit access (ID 5)"
And I press "Add access for group \"group 01\""
......
......@@ -26,7 +26,7 @@
And I follow "Portfolio"
And I follow "A's Page 01"
And I follow "Edit this page"
And I follow "Share page »"
And I follow "Share page"
And I follow "Select all"
And I press "Public"
And I press "editaccess_submit"
......@@ -36,7 +36,7 @@
And I click on "Advanced options"
And I click on "Select all"
And I select "title" from "sort"
And I press "search_search"
And I press "search_submit"
And I should see "Maximum items per page:"
And I select "1" from "limit"
And I wait until the page is ready
......@@ -44,6 +44,6 @@
And I should see "2"
And I should see "3"
And I follow "3"
And I wait until the page is ready
And I wait "1" seconds
And I should see "4"
And I should see "5"
......@@ -16,11 +16,11 @@ Scenario: Create a page and secret URLs to copy (Bug 1426983)
And I press "Save"
# Verifying page was created
And I should see "Page saved successfully"
And I press "Done"
And I follow "Display page"
# Navigating to shared by be to click button
And I choose "Shared by me" in "Portfolio"
And I click on "secreturl_6"
And I press "Add"
And I click on "Edit secret URL access"
And I press "New secret URL"
# Verifying Secret URLs was created
And I choose "Shared by me" in "Portfolio"
Then I should see "1"
......@@ -36,7 +36,7 @@ Scenario: Creating and accessing social media buttons (Bug 1448948)
And I follow "Display settings"
And the field "buttons with icons and text" matches value "1"
And I press "Save"
And I follow "Share page »"
And I follow "Share page"
And I press "Add access for \"Public\""
And I press "Save"
And I should see "Access rules were updated for 1 page(s)"
......
......@@ -41,6 +41,6 @@ Scenario: Create groups and limit display on profile page (Bug 1426983)
And I set the following fields to these values:
| Maximum number of groups to display | 3 |
And I press "Save"
And I press "Done"
And I follow "Display page"
And I follow "Profile page"
And I should see "11 groups"
......@@ -138,14 +138,14 @@ These list must take into account the sort option choosen in the block config (B
And I select "Most recently updated" from "Sort shared pages and collections by"
And I select "Most recently submitted" from "Sort submitted pages and collections by"
And I press "Save"
And I press "Done"
And I follow "Display page"
# Update the group page "Page Group Z_06"
And I follow "Pages" in the "ul.in-page-tabs" "css_element"
And I click on "Edit content and layout" in "Page Group Z_06" row
And I follow "Edit title and description"
And I set the field "Page description" to "<p>Group page 06 (updated)</p>"
And I press "Save"
And I press "Done"
And I follow "Display page"
# Check if it is now in the first page of the list of group pages
And I follow "About" in the "ul.in-page-tabs" "css_element"
And I should see "Page Group Z_06" in the "div#groupviewlist" "css_element"
......@@ -157,7 +157,7 @@ These list must take into account the sort option choosen in the block config (B
And I follow "Edit title and description"
And I set the field "Page description" to "<p>This is the page 01 (updated)</p>"
And I press "Save"
And I press "Done"
And I follow "Display page"
# Check if it is now in the first page of the list of shared pages
And I choose "Groups"
And I follow "Group Z"
......
@javascript @core @core_view @core_portfolio
Feature: Adjusting the max items limit on the Shared with me page.
In order to be able to display a set amount of items on the shared with me page
As an admin
In order to be able to display a set amount of items on the shared with me page
As an admin
So I can view only a limited amount of pages at one time.
Scenario: Making sure that the max items per page drop down limits to correct amount of pages (Bug 1409369)
......@@ -66,7 +68,7 @@
When I follow "Portfolio"
And I follow "A's Page 01"
And I follow "Edit this page"
And I follow "Share page »"
And I follow "Share page"
And I follow "Select all"
And I press "Public"
And I press "editaccess_submit"
......@@ -76,7 +78,7 @@
And I click on "Advanced options"
And I click on "Select all"
And I select "title" from "sort"
And I press "search_search"
And I press "search_submit"
Then I should see "Maximum items per page:"
And I select "1" from "limit"
And I wait until the page is ready
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment