Merge "Behat Testsuite: Tidying features in Artefact (Bug #1446395)"

test/behat/features/artefact/blog/AddBlogs.feature

-@javascript @plugin @artefact.blog
-Feature: Mahara users can create their blogs
-    As a mahara user
-    I need to create blogs
-
-    Background:
-        Given the following "users" exist:
-            | username | password | email | firstname | lastname | institution | authname | role |
-            | userA | Password1 | test01@example.com | Pete | Mc | mahara | internal | member |
-    Scenario: create blogs
-        Given I log in as "userA" with password "Password1"
-        And I set the following account settings values:
-            | field | value |
-            | multipleblogs | 1 |
-            | tagssideblockmaxtags | 10 |
-        When I follow "Settings"
-        And I fill in the following:
-            | tagssideblockmaxtags | 10 |
-        And I check "multipleblogs"
-        And I press "Save"
-        When I go to "artefact/blog/index.php"
-        Then I should see "Journals"
-        When I click on "Create journal"
-        And I fill in the following:
-            | title | My new journal |
-            | tags | blog |
-#        And I set the field "description" to "<em> This is my new blog </em>"
-        And I press "Create journal"
-        Then I should see "My new journal"
\ No newline at end of file

test/behat/features/artefact/blog/add_blogs.feature

+@javascript @core_artefact
+Feature: Mahara users can create their blogs
+    As a mahara user
+    I need to create blogs
+
+ Background:
+  Given the following "users" exist:
+    | username | password | email | firstname | lastname | institution | authname | role |
+    | userA | Password1 | test01@example.com | Pete | Mc | mahara | internal | member |
+
+ Scenario: Create blogs
+  Given I log in as "userA" with password "Password1"
+  And I set the following account settings values:
+    | field | value |
+    | multipleblogs | 1 |
+    | tagssideblockmaxtags | 10 |
+  When I follow "Settings"
+  And I fill in the following:
+    | tagssideblockmaxtags | 10 |
+  And I check "multipleblogs"
+  And I press "Save"
+  When I go to "artefact/blog/index.php"
+  And I should see "Journals"
+  When I click on "Create journal"
+  And I fill in the following:
+    | title | My new journal |
+    | tags | blog |
+  And I press "Create journal"
+  Then I should see "My new journal"

test/behat/features/artefact/collections/adding_pages_collection.feature

-@javascript @core @core_portfolio @core_collection
+@javascript @core @core_artefact @core_portfolio @core_collection
 Feature: Adding pages to a collection
    In order to add pages to a collection
    As an admin I need pages
    So I can add them to the collection
 
+
 Scenario: Creating a collection AND adding pages
     # Log in as "Admin" user
     Given I log in as "admin" with password "Password1"
     # Verifying log in was successful
     And I should see "Admin User"
-    # Create page 1
-    When I follow "Portfolio"
-    And I press "Create page"
-    And I fill in the following:
-        | Page title | Testing page 1 |
-    And I press "Save"
-    # Create page 2
-    And I follow "Portfolio"
-    And I press "Create page"
-    And I fill in the following:
-        | Page title | Testing page 2 |
-    And I press "Save"
-    # Create page 3
-    And I follow "Portfolio"
-    And I press "Create page"
-    And I fill in the following:
-        | Page title | Testing page 3 |
-    And I press "Save"
+    Given the following "pages" exist:
+     | title | description| ownertype | ownername |
+     | Testing page 1 | UserD's page 01 | user | admin  |
+     | Testing page 2 | UserD's page 02 | user | admin |
+     | Testing page 3 | UserA's page 01 | user | admin |
     # Create Test collection
     And I choose "Collections" in "Portfolio"
     And I follow "New collection"
@@ -41,3 +29,10 @@ Scenario: Creating a collection AND adding pages
     And I should see "Testing page 1"
     And I should see "Testing page 2"
     And I should see "Testing page 3"
+      # Sort pages by Last modified
+    Then I follow "Portfolio"
+    And I select "Last modified" from "Sort by:"
+    And I press "Search"
+    # Checking they are in the right order
+    And "Testing page 1" "link" should appear before "Testing page 2" "link"
+    And "Testing page 2" "link" should appear before "Testing page 3" "link"

test/behat/features/artefact/collections/feedback_configuration.feature

-@javascript @core @core_portfolio
+@javascript @core_artefact @core @core_portfolio
 Feature: Page feedback configuration
 In order to change the settings for placing feedback for a page
 As an admin

test/behat/features/artefact/collections/files_add_edit.feature

-@javascript @core @core_content
+@javascript @core @core_artefact @core_content
 Feature: Creating folders
    In order to fill in a folder with content
    As an admin I need to create a folder with other folders inside

test/behat/features/artefact/collections/page_number_interval_sharedwithme.feature

-@javascript @core @core_portfolio
+@javascript @core_artefact @core @core_portfolio
  Feature: Adding more links to the jump list of the paginator on "Shared with me" page
   In order to be able to see and follow hyperlinks to numbered page lists across paginator in regular intervals
   As a student

test/behat/features/artefact/collections/secret_url.feature

-@javascript @core @core_portfolio
+@javascript @core @core_artefact @core_portfolio
 Feature: Button to reliably copy secret URLs
     In order to copy a secret URLs
     As an admin I need to create page
@@ -23,4 +23,4 @@ Scenario: Create a page and secret URLs to copy (Bug 1426983)
     And I press "Add"
     # Verifying Secret URLs was created
     And I choose "Shared by me" in "Portfolio"
-    And I should see "1"
+    Then I should see "1"

test/behat/features/artefact/collections/sort_portfolio.feature

-@javascript @core @core_portfolio
-Feature: Sort portfolio pages on portfolio page overview
-    In order to sort by pages
-    As an admin create pages
-    So I can sort them by their modified date
-
-Scenario: Sort portfolio pages on portfolio page overview (Bug 1426983)
-    # Log in as "Admin" user
-    Given I log in as "admin" with password "Password1"
-    # Verifying log in was successful
-    And I should see "Admin User"
-    # Creating page 1
-    When I follow "Portfolio"
-    And I press "Create page"
-    And I fill in the following:
-        | Page title    | A1    |
-    And I press "Save"
-    And I follow "Portfolio"
-    # Creating page 2
-    And I press "Create page"
-    And I fill in the following:
-        | Page title    | B2    |
-    And I press "Save"
-    # Creating page 3
-    And I follow "Portfolio"
-    And I press "Create page"
-    And I fill in the following:
-        | Page title    | C3PO  |
-    And I press "Save"
-    # Sort pages by Last modified
-    Then I follow "Portfolio"
-    And I select "Last modified" from "Sort by:"
-    And I press "Search"
-    # Checking they are all there and saved
-    And I should see "A1"
-    And I should see "B2"
-    And I should see "C3PO"
-    And I should see "Dashboard page"
-    And I should see "Profile page"
-    # Checking they are in the right order
-    And "C3PO" "link" should appear before "B2" "link"
-    And "B2" "link" should appear before "A1" "link"

test/behat/features/artefact/résumé/resume_page.feature

-@javascript @core @core_artefact
+@javascript @core @core_artefact @core_content
 Feature: Editing a Resume page
    In order to edit a resume page
    As an admin I need to go to Content