merges in develop with agreed version of nav

johnnymo87 · Jun 17, 2014 · 6eb96fe · 6eb96fe
2 parents d12fb19 + d1205ca
commit 6eb96fe
Show file tree

Hide file tree

Showing 41 changed files with 358 additions and 544 deletions.
diff --git a/features/admin/acknowledging_contributors_site.feature b/features/admin/acknowledging_contributors_site.feature
@@ -3,15 +3,15 @@ Feature: Acknowledging Contributors
   So that I can encourage continued support from vendors and developers
   I want to see acknowledgement of support on every page
 
-Background: 
+  Background:
 
   Scenario Outline: Display acknowledgements
-    Given I am on the <page>
+    Given I visit the <page> page
     Then I should see the "Agile Ventures" image linked to contributors
     And I should see the "Ninefold" image linked to "https://ninefold.com"
   Examples:
-    | page                 |
-    | home page            |
-    | charity search page  |
-    | new charity page     |
+    | page                |
+    | home                |
+    | organisations index |
+    | new organisation    |
 
diff --git a/features/admin/admin_edit_charity.feature b/features/admin/admin_edit_charity.feature
@@ -29,14 +29,14 @@ Feature: Admin editing charity
 
   Scenario: Non-admin sees no permission error when visiting the edit form for charity
     Given I am signed in as a non-admin
-    And I am furtively on the edit charity page for "Friendly"
-    Then I should be on the charity page for "Friendly"
+    And I visit the edit page for the organization named "Friendly"
+    Then I should be on the show page for the organization named "Friendly"
     And I should see permission denied
 
   Scenario: Non-admin unsuccessfully attempts to delete a charity
     Given I am signed in as a non-admin
     And I delete "Friendly" charity
-    Then I should be on the charity page for "Friendly"
+    Then I should be on the show page for the organization named "Friendly"
     And I should see permission denied
 
 
diff --git a/features/admin/admin_edit_static_page_links.feature b/features/admin/admin_edit_static_page_links.feature
@@ -17,7 +17,7 @@ Feature: I want to be able to edit static page links
     And cookies are approved
 
      Scenario: Having all pages show automatically
-       And I am on the home page
+       And I visit the home page
        Then I should see "About HCN"
        And I should not see "Contact Info"
 
@@ -26,11 +26,11 @@ Feature: I want to be able to edit static page links
        And I visit "pages/about/edit"
        And I uncheck "Show a public link to this page"
        And I press "Update Page"
-       And I am on the home page
+       And I visit the home page
        Then the "about" link is not in the footer     
        And I visit "pages/about/edit"
        And I check "Show a public link to this page"
        And I press "Update Page"
-       And I am on the home page
+       And I visit the home page
        Then the "about" link is in the footer     
 
diff --git a/features/admin/admin_edit_static_pages.feature b/features/admin/admin_edit_static_pages.feature
@@ -35,28 +35,28 @@ Feature: I want to be able to edit static pages
 
   Scenario: Admin can edit
     Given I am signed in as a admin
-    And I am on the home page
+    And I visit the home page
     When I follow "About Us"
     Then I should see a link with text "Edit"
     And I follow "Edit"
     Then I should be on the edit page for "about"
 
   Scenario: Non-admin cannot edit
     Given I am signed in as a non-admin
-    And I am on the home page
+    And I visit the home page
     When I follow "About Us"
     Then I should not see a link with text "Edit"
 
   Scenario: Admin can see pages index
     Given I am signed in as a admin
-    And I am on the home page
+    And I visit the home page
     When I follow "About Us"
     And I follow "Pages"
     Then the URL should contain "pages"
 
   Scenario: Pages index is sorted by default
     Given I am signed in as a admin
-    And I am on the home page
+    And I visit the home page
     When I follow "About Us"
     And I follow "Pages"
     Then I should see "Bob" page before "Wow"
@@ -78,7 +78,7 @@ Feature: I want to be able to edit static pages
     And I should see "xyz789"
 
   Scenario: Basic markdown syntax works
-    Given I am on the home page
+    Given I visit the home page
     When I follow "Contact"
     Then I should see "significant" < emphasized >
     And I should see "important" < stronged >

diff --git a/features/admin/admin_new_charity.feature b/features/admin/admin_new_charity.feature
@@ -16,7 +16,7 @@ Feature: Admin creating charity
 
   Scenario: Unsuccessfully attempt to create charity without being signed-in
       # should this be checking for absence of link to the new org page?
-    Given I am on the new charity page
+    Given I visit the new organisation page
     Then I should be on the sign in page
 
 # beta version only allows admin to create new organization, currently
@@ -26,7 +26,7 @@ Feature: Admin creating charity
   #Scenario: Unsuccessfully attempt to create charity when signed-in as non-admin
     ## should this be checking for absence of link to the new org page?
     #Given I am signed in as a non-admin
-    #Given I am on the new charity page
+    #Given I visit the new organisation page
     #Then I should be on the sign in page
 
   Scenario: Successfully create charity while being signed-in as admin
@@ -36,7 +36,7 @@ Feature: Admin creating charity
 
   Scenario: Successfully create charity while being signed-in as admin from arbitrary page
     Given I am signed in as a admin
-    Given I am on the charity page for "Friendly Clone"
+    Given I visit the show page for the organization named "Friendly Clone"
     And I follow "New Organisation"
     And I fill in the new charity page validly
     And I press "Create Organisation"
@@ -51,10 +51,10 @@ Feature: Admin creating charity
     And "Unwanted" org should not exist
 
   Scenario: non logged in user should not see new organization link
-    Given I am on the home page
+    Given I visit the home page
     Then I should not see a new organizations link
 
   Scenario: logged in non-admin user should not see new organization link
     Given I am signed in as a non-admin
-    Given I am on the home page
+    Given I visit the home page
     Then I should not see a new organizations link
diff --git a/features/admin/admin_promoting_site.feature b/features/admin/admin_promoting_site.feature
@@ -7,12 +7,12 @@ Feature: Admin promoting site
 Background: 
 
   Scenario Outline: Be aware of site identity on all pages
-    Given I am on the <page>
+    Given I visit the <page>
     Then I should see "Harrow Community Network"
     And I should see "Search for local voluntary and community organisations"
   Examples:
     | page                 |
     | home page            |
-    | charity search page  |
-    | new charity page     |
+    | organisations index page  |
+    | new organisation page     |
 
diff --git a/features/admin/navbar.feature b/features/admin/navbar.feature
@@ -11,8 +11,8 @@ Feature: Admin user interface
       | email                 | password       | admin | confirmed_at        | organization | pending_organization |
       | admin@harrowcn.org.uk | mypassword1234 | true  | 2008-01-01 00:00:00 |              |                      |
     And I am signed in as a admin
-    And I am on the home page
     And that the volunteer_ops_list flag is enabled
+    And I visit the home page
 
   Scenario Outline: Top navbar has an Admin dropdown menu
     Then the Admin menu has a valid <link> link

diff --git a/features/admin/organization_reports/without_users.feature b/features/admin/organization_reports/without_users.feature
@@ -78,11 +78,11 @@ Feature: Orphans UI
     Given I click on the invitation link in the email to "admin@another.org"
     And I accepted the cookie policy from the "invitation" page
     And I set my password
-    Then I should be on the charity page for "Yet Another Org"
+    Then I should be on the show page for the organization named "Yet Another Org"
 
   Scenario: Invited user clicking through on email ignoring cookies policy
     Given I click on the invitation link in the email to "admin@another.org"
     And I set my password
-    Then I should be on the charity page for "Yet Another Org"
+    Then I should be on the show page for the organization named "Yet Another Org"
 
 
diff --git a/features/admin/user_reports/invited_users_page.feature b/features/admin/user_reports/invited_users_page.feature
@@ -13,7 +13,6 @@ Feature: Invited Users Page
       | regular@user.org | mypassword1234 | false | 2008-01-01 00:00:00 |                 |                      |
     And the admin invited a user for "Invited Organization"
 
-  @javascript
   Scenario: Page shows only invited users
     Given cookies are approved
     And I am signed in as an admin

diff --git a/features/admin/user_reports/manage_charity_admins.feature b/features/admin/user_reports/manage_charity_admins.feature
@@ -16,12 +16,12 @@ Background: organizations have been added to database
 
  Scenario: Existing charity admin appears in form when editing charity
    Given I am signed in as a admin
-   And I am on the edit charity page for "Friendly"
+   And I visit the edit page for the organization named "Friendly"
    Then I should see "registered-user-1@example.com" in the charity admin email
 
  Scenario: No admin message displayed when charity has no admins
    Given I am signed in as a admin
-   And I am on the edit charity page for "Friendly Clone"
+   And I visit the edit page for the organization named "Friendly Clone"
    Then I should see the no charity admins message
 
  Scenario: Cannot add non-existent user as charity admin

diff --git a/features/cookie-policy.feature b/features/cookie-policy.feature
@@ -5,18 +5,14 @@ Feature: Approve cookies
   Tracker story ID: https://www.pivotaltracker.com/story/show/56438038
 
   Background:
-    Given I am on the password reset page
-    Then I should see an approve cookie policy message
+    Given the following users are registered:
+      | email                            | password | confirmed_at        |
+      | registered-user@example.com      | pppppppp | 2014-01-20 16:27:36 |
+    Given I receive a new password for "registered-user@example.com"
+    Then I should be on the password reset page
+    And I should see an approve cookie policy message
 
   Scenario: User approving the cookies
     Given I click "Close"
     Then I should not see an approve cookie policy message
-    And I should be on the password reset page
-
-  @javascript
-  Scenario: Check that cookies can be approved even with JavaScript
-    Given I click "Close"
-    Then I should not see an approve cookie policy message
-    And I should be on the password reset page
-
-
+    And I should be on the password reset page
diff --git a/features/disclaimer.feature b/features/disclaimer.feature
@@ -4,7 +4,7 @@ Feature: Disclaimer about not being able to guarantee accuracy of sites content
   I want to show a link to a disclaimer on every page
   Tracker story ID: https://www.pivotaltracker.com/story/show/49757817
 
-Background: organizations have been added to database
+  Background: organizations have been added to database
 
   Given the following organizations exist:
     | name             | address        |
@@ -15,13 +15,13 @@ Background: organizations have been added to database
     | Disclaimer | disclaimer | We disclaim everything!                                   | true         |
 
   Scenario Outline: the disclaimer page is accessible on all pages
-    Given I am on the <page>
+    Given I visit the <page>
     When I follow "Disclaimer"
     Then I should see "We disclaim everything!"
   Examples:
-    | page                                |
-    | home page                           |
-    | charity search page                 |
-    | new charity page                    |
-    | charity page for "Friendly Charity" |
+    | page                                                    |
+    | home page                                               |
+    | organisations index page                                |
+    | new organisation page                                   |
+    | show page for the organization named "Friendly Charity" |
 
diff --git a/features/display_project_contributors.feature b/features/display_project_contributors.feature
@@ -8,15 +8,15 @@ Background:
   | john   | http://example.com/john.png   | http://github.com/john   | 10            |
 
 Scenario: Display project contributors
-  Given I am on the home page
+  Given I visit the home page
   And I follow the AgileVentures logo
   Then I should be on the contributors page
   And I should see "Project Contributors"
   And I should see "thomas"
   And I should see "john"
 
 Scenario: Display avatar and links
-  Given I am on the contributors page
+  Given I visit the contributors page
   Then I should see a link avatar for "thomas"
   And I should see a link avatar for "john"
 

diff --git a/features/home_page/category.feature b/features/home_page/category.feature
@@ -24,15 +24,15 @@ Feature: Categories of charities
 
   Scenario: Search for organizations in the "Animal Welfare" category
   #Given I have at least 3 organizations in the "Animal Welfare" category
-    Given I am on the home page
+    Given I visit the home page
     And I select the "Animal Welfare" category
     And I press "Submit"
     Then I should see "I love dogs"
     And I should not see "I hate animals"
 
     # TODO must ensure this also works with searching for text so we can search within a category
   Scenario: Search for dogs in the Animal Welfare category
-    Given I am on the home page
+    Given I visit the home page
     And I select the "Animal Welfare" category
     And I search for "dogs"
     Then I should see "I love dogs"

diff --git a/features/home_page/infinite_scrolling_pagination.feature b/features/home_page/infinite_scrolling_pagination.feature