From f8339f3b02d6b3905ccfd54c084fef64c3142d33 Mon Sep 17 00:00:00 2001
From: johnnymo87 <johnnymo87@gmail.com>
Date: Thu, 24 Apr 2014 17:22:17 +0100
Subject: [PATCH 01/14] developing a new system for calling paths

---
 features/admin/admin_new_charity.feature      |  2 +-
 features/cookie-policy.feature                |  4 +-
 features/sign_in_sign_up/sign_up.feature      |  6 +--
 .../sign_up_link_to_org.feature               |  4 +-
 .../step_definitions/authentication_steps.rb  | 12 ++---
 features/step_definitions/navigation_steps.rb | 53 ++++++++++---------
 spec/requests/organizations_spec.rb           |  6 +++
 7 files changed, 48 insertions(+), 39 deletions(-)

diff --git a/features/admin/admin_new_charity.feature b/features/admin/admin_new_charity.feature
index 082b15b10..ac9e27feb 100644
--- 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 am on the new organisation page
     Then I should be on the sign in page
 
 # beta version only allows admin to create new organization, currently
diff --git a/features/cookie-policy.feature b/features/cookie-policy.feature
index 05845dd5b..2c43a2915 100644
--- a/features/cookie-policy.feature
+++ b/features/cookie-policy.feature
@@ -5,7 +5,9 @@ Feature: Approve cookies
   Tracker story ID: https://www.pivotaltracker.com/story/show/56438038
 
   Background:
-    Given I am on the password reset page
+    Given I visit the password reset page with params:
+      | key                  | value           |
+      | reset password token | 18217tiegi1qwea |
     Then I should see an approve cookie policy message
 
   Scenario: User approving the cookies
diff --git a/features/sign_in_sign_up/sign_up.feature b/features/sign_in_sign_up/sign_up.feature
index 150c3fc67..c48885095 100644
--- a/features/sign_in_sign_up/sign_up.feature
+++ b/features/sign_in_sign_up/sign_up.feature
@@ -13,21 +13,21 @@ Background:
   And cookies are approved
 @email
 Scenario: Sign up for an existing user
-  Given I am on the sign up page
+  Given I visit sign up page
   And I sign up as "existent-user1@example.com" with password "pppppppp" and password confirmation "pppppppp"
   Then I should see "Email has already been taken"
   And I should not receive an email
   
 @email
 Scenario: Sign up for an non-existent user with non-matching password confirmation
-  Given I am on the sign up page
+  Given I visit sign up page
   And I sign up as "existent-user2@example.com" with password "pppppppp" and password confirmation "aaaaaaaa"
   Then I should see "Password doesn't match confirmation"
   And I should not receive an email
   
 @email
 Scenario: Sign up for a non-existent user
-  Given I am on the sign up page
+  Given I visit sign up page
   And I sign up as "non-existent-user@example.com" with password "pppppppp" and password confirmation "pppppppp"
   Then I should be on the home page
   And I should see "A message with a confirmation link has been sent to your email address. Please open the link to activate your account."
diff --git a/features/sign_in_sign_up/sign_up_link_to_org.feature b/features/sign_in_sign_up/sign_up_link_to_org.feature
index 5ce43b15e..3f41bd44a 100644
--- a/features/sign_in_sign_up/sign_up_link_to_org.feature
+++ b/features/sign_in_sign_up/sign_up_link_to_org.feature
@@ -11,14 +11,14 @@ Feature: If new user's email matches an org's email, the new user with have edit
     And cookies are approved
 
   Scenario: Sign up and CANNOT edit
-    Given I am on the sign up page
+    Given I visit sign up page
     And I sign up as "tester@friendly.org" with password "12345678" and password confirmation "12345678"
     And I sign in as "tester@friendly.org" with password "12345678" via email confirmation
     And I am on the charity page for "Friendly"
     Then I should not see an edit button for "Friendly" charity
 
   Scenario: Sign up and can edit
-    Given I am on the sign up page
+    Given I visit sign up page
     And I sign up as "info@friendly.org" with password "12345678" and password confirmation "12345678"
     And I sign in as "info@friendly.org" with password "12345678" via email confirmation
     And I am on the charity page for "Friendly"
diff --git a/features/step_definitions/authentication_steps.rb b/features/step_definitions/authentication_steps.rb
index f11519d58..3fe11730a 100644
--- a/features/step_definitions/authentication_steps.rb
+++ b/features/step_definitions/authentication_steps.rb
@@ -29,7 +29,7 @@
 And /^I am signed in as the admin using password "(.*?)"$/ do |password|
   admin = User.find_by_admin(true)
   steps %Q{
-    Given I am on the sign in page
+    Given I visit the sign in page
     And I sign in as "#{admin.email}" with password "#{password}"
   }
 end
@@ -37,7 +37,7 @@
 And /^I am not signed in as the admin using password "(.*?)"$/ do |password|
   admin = User.find_by_admin(false)
   steps %Q{
-    Given I am on the sign in page
+    Given I visit the sign in page
     And I sign in as "#{admin.email}" with password "#{password}"
   }
 end
@@ -66,7 +66,7 @@
 
 Then /^I should not be signed in as any user$/ do
   steps %Q{
-    Given I am on the new charity page
+    Given I visit the new organisation page
     Then I should not see "Signed in as"
   }
 end
@@ -81,8 +81,8 @@
   click_link_or_button "Sign in"
 end
 
-Given /^I am on the sign up page$/ do
-  step "I am on the home page"
+Given /^I visit the sign up page$/ do
+  step "I visit the home page"
   expect(page).to have_field('signup_email')
   expect(page).to have_field('signup_password')
   expect(page).to have_button('signup')
@@ -96,7 +96,7 @@
   user = User.find_by_email("#{email}")
   user.confirm!
   steps %Q{
-    Given I am on the home page
+    Given I visit the home page
     And I sign in as "#{email}" with password "#{password}"
   }
 end
diff --git a/features/step_definitions/navigation_steps.rb b/features/step_definitions/navigation_steps.rb
index 50379d7d9..c4aea6b39 100644
--- a/features/step_definitions/navigation_steps.rb
+++ b/features/step_definitions/navigation_steps.rb
@@ -1,6 +1,3 @@
-Given /^I am on the home page$/ do
-  visit "/"
-end
 And /^I select the "(.*?)" category$/ do |category|
   select(category, :from => "category[id]")
 end
@@ -9,26 +6,34 @@
   visit path
 end
 
-def paths
+def paths(location, params = {})
   {
-      'home' => root_path,
-      'sign up' => new_user_registration_path,
-      'sign in' => new_user_session_path,
-      'organisations index' => organizations_path,
-      'contributors' => contributors_path,
-      'password reset' => edit_user_password_path,
-      'invitation' => accept_user_invitation_path,
-      'organisations without users' => organizations_report_path,
-      'all users' => users_report_path,
-      'invited users' => invited_users_report_path,
-      'volunteer opportunities' => volunteer_ops_path
-  }
-end
-
-Then /^I visit the (.*) page$/ do |location|
-  location = location.downcase
-  raise "No matching path found for #{location}" if paths[location].nil?
-  visit paths[location]
+      'home' => root_path(params),
+      'sign up' => new_user_registration_path(params),
+      'sign in' => new_user_session_path(params),
+      'organisations index' => organizations_path(params),
+      'contributors' => contributors_path(params),
+      'password reset' => edit_user_password_path(params),
+      'invitation' => accept_user_invitation_path(params),
+      'organisations without users' => organizations_report_path(params),
+      'all users' => users_report_path(params),
+      'invited users' => invited_users_report_path(params),
+      'volunteer opportunities' => volunteer_ops_path(params),
+      'new organisation' => new_organization_path(params)
+  }[location]
+end
+
+Then /^I visit the (.*) page?$/ do |location|
+  location.downcase!
+  raise "No matching path found for #{location}" if paths(location).nil?
+  visit paths(location)
+end
+
+Then /^I visit the (.*) page with params:$/ do |location, table|
+  params = Hash[table.rows]
+  location.downcase!
+  raise "No matching path found for #{location}" if paths(location).nil?
+  visit paths(location, params)
 end
 
 Then /^I visit the (.*) page for organization "(.*?)"$/ do |location, organization|
@@ -121,10 +126,6 @@ def paths
   }
 end
 
-Given /^I am on the new charity page$/ do
-  visit new_organization_path
-end
-
 Then /^I should be on the new charity page$/ do
  current_path.should == new_organization_path
 end
diff --git a/spec/requests/organizations_spec.rb b/spec/requests/organizations_spec.rb
index 81e81cfa1..ae84c540e 100644
--- a/spec/requests/organizations_spec.rb
+++ b/spec/requests/organizations_spec.rb
@@ -5,5 +5,11 @@
     it "works! (now write some real specs)" do
       get organizations_path
     end
+
+    it 'test' do
+      get edit_user_password_path
+      debugger
+      puts 'hi'
+    end
   end
 end

From cefe6a3e6aa3f4f943993f5d17f8a75666413673 Mon Sep 17 00:00:00 2001
From: johnnymo87 <johnnymo87@gmail.com>
Date: Thu, 24 Apr 2014 18:37:12 +0100
Subject: [PATCH 02/14] matcher for edit|show page for given object with given
 name

---
 features/admin/admin_new_charity.feature           |  2 +-
 .../individual_charity_pages/charity_page.feature  |  7 +------
 .../individual_charity_pages/donation_info.feature |  8 +-------
 .../edit_own_charity_profile.feature               | 14 +++++++-------
 .../this-is-my-org.feature                         |  6 +++---
 .../sign_in_sign_up/sign_up_link_to_org.feature    |  4 ++--
 features/step_definitions/authentication_steps.rb  |  6 +-----
 features/step_definitions/navigation_steps.rb      |  8 +++++++-
 .../create_volunteer_opportunities.feature         |  2 +-
 spec/requests/organizations_spec.rb                |  6 ------
 10 files changed, 24 insertions(+), 39 deletions(-)

diff --git a/features/admin/admin_new_charity.feature b/features/admin/admin_new_charity.feature
index ac9e27feb..d965f0131 100644
--- a/features/admin/admin_new_charity.feature
+++ b/features/admin/admin_new_charity.feature
@@ -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"
diff --git a/features/individual_charity_pages/charity_page.feature b/features/individual_charity_pages/charity_page.feature
index ab8fd60cf..e531e7a8b 100644
--- a/features/individual_charity_pages/charity_page.feature
+++ b/features/individual_charity_pages/charity_page.feature
@@ -9,26 +9,22 @@ Feature: Web page owned by each charity
       | name           | description               | address        | postcode | telephone | website              | email              |
       | Friendly       | Bereavement Counselling   | 34 pinner road | HA1 4HZ  | 020800000 | http://friendly.org  | admin@friendly.xx  |
       | Friendly Clone | Quite Friendly!           | 30 pinner road |          | 020800010 |                      |                    |
-
     Given the following users are registered:
       | email                         | password | organization | confirmed_at         |
       | registered_user-1@example.com | pppppppp | Friendly     | 2007-01-01  10:00:00 |
       | registered_user-2@example.com | pppppppp |              | 2007-01-01  10:00:00 |
+    And I visit the show page for the organization named "Friendly"
 
   Scenario: be able to view link to charity site on individual charity page
-    Given I am on the charity page for "Friendly"
     Then I should see the external website link for "Friendly" charity
 
   Scenario: display charity title in a visible way
-    Given I am on the charity page for "Friendly"
     Then I should see "Friendly" < tagged > with "h3"
 
   Scenario: show organization e-mail as link
-    Given I am on the charity page for "Friendly"
     Then I should see a mail-link to "admin@friendly.xx"
 
   Scenario Outline: show labels if field is present
-    Given I am on the charity page for "Friendly"
     Then I should see "<label>"
   Examples:
     | label    |
@@ -36,7 +32,6 @@ Feature: Web page owned by each charity
     |Email     |
 
   Scenario Outline: hide labels if field is empty
-    Given I am on the charity page for "Friendly Clone"
     Then I should not see "<label>"
     Examples:
     | label    |
diff --git a/features/individual_charity_pages/donation_info.feature b/features/individual_charity_pages/donation_info.feature
index 6628b1bd5..5467cf9d7 100644
--- a/features/individual_charity_pages/donation_info.feature
+++ b/features/individual_charity_pages/donation_info.feature
@@ -8,14 +8,8 @@ Background: organizations have been added to database
   
   Given the following organizations exist:
     | name                            | donation_info                      | address        |
-    | Harrow Bereavement Counselling  | www.harrow-bereavment.co.uk/donate | 34 pinner road |
-    | Indian Elders Associaton        | www.indian-elders.co.uk/donate     | 64 pinner road |
     | Age UK                          | www.age-uk.co.uk/donate            | 84 pinner road |
-  #adding this to the above table makes the donation_info not be nil.  need to find better solution
-  Given the following organizations exist:
-    |name             | address        |
-    |Friendly Charity | 83 pinner road |
 
 Scenario: Org page of an organization with donation info URL
-  Given I am on the charity page for "Age UK"
+  Given I visit the show page for the organization named "Age UK"
   Then I should see the donation_info URL for "Age UK"
\ No newline at end of file
diff --git a/features/individual_charity_pages/edit_own_charity_profile.feature b/features/individual_charity_pages/edit_own_charity_profile.feature
index db517d787..3dbb25bfb 100644
--- a/features/individual_charity_pages/edit_own_charity_profile.feature
+++ b/features/individual_charity_pages/edit_own_charity_profile.feature
@@ -58,11 +58,11 @@ Examples:
 
 Scenario: Do not see edit button as non-admin not associated with Friendly
   Given I am signed in as a charity worker unrelated to "Friendly"
-  And I am on the charity page for "Friendly"
+  And I visit the show page for the organization named "Friendly"
   Then I should not see an edit button for "Friendly" charity
 
 Scenario: Non-logged in users do not see edit button either
-  Given I am on the charity page for "Friendly"
+  Given I visit the show page for the organization named "Friendly"
   Then I should not see an edit button for "Friendly" charity
 
 Scenario: Change the address of a charity when Google is indisposed
@@ -71,7 +71,7 @@ Scenario: Change the address of a charity when Google is indisposed
   Then I should not see the unable to save organization error
   Then the address for "Friendly" should be "83 pinner road"
   # TODO Then I should see "Failed to update map coordinates"
-  And I should be on the charity page for "Friendly"
+  And I visit the show page for the organization named "Friendly"
 #  TODO possible follow on if we could have the request re-issued on next page load
 #  Given Google is no longer indisposed
 #  And I am on the home page
@@ -84,17 +84,17 @@ Scenario: Redirected to sign-in when not signed-in and edit donation url
 # TODO after sign in is take the user back to the edit page
 
 Scenario: By default, not display organizations address and phone number on home page
-  Given I am on the charity page for "Friendly"
+  Given I visit the show page for the organization named "Friendly"
   Then I should not see any address or telephone information for "Nice" and "Friendly"
 
 Scenario: By default, not display organizations edit and delete on home page
-  Given I am on the charity page for "Friendly"
+  Given I visit the show page for the organization named "Friendly"
   Then I should not see any edit or delete links
 
 Scenario: By default, not display organizations address and phone number on details page
-  Given I am on the charity page for "Friendly"
+  Given I visit the show page for the organization named "Friendly"
   Then I should not see any address or telephone information for "Friendly"
 
 Scenario: By default, not display edit link on details page
-  Given I am on the charity page for "Friendly"
+  Given I visit the show page for the organization named "Friendly"
   Then I should not see any edit link for "Friendly"
diff --git a/features/individual_charity_pages/this-is-my-org.feature b/features/individual_charity_pages/this-is-my-org.feature
index 2c359e0c2..2eaaa3255 100644
--- a/features/individual_charity_pages/this-is-my-org.feature
+++ b/features/individual_charity_pages/this-is-my-org.feature
@@ -14,7 +14,7 @@ Feature: This is my organization
 
   Scenario: I am a signed in user who requests to be admin for my organization
     Given I am signed in as a non-admin 
-    When I am on the charity page for "The Organization"
+    When I visit the show page for the organization named "The Organization"
     Then I should see a link or button "This is my organization"
     And I click "This is my organization"
     Then I should be on the charity page for "The Organization"
@@ -22,7 +22,7 @@ Feature: This is my organization
 
   @javascript
   Scenario: I am not signed in, I will be offered "This is my organization" claim button
-    When I am on the charity page for "The Organization"
+    When I visit the show page for the organization named "The Organization"
     Then I should see "This is my organization"
     When I click id "TIMO"
     Then I should be on the charity page for "The Organization"
@@ -31,7 +31,7 @@ Feature: This is my organization
 
   @javascript
   Scenario: I am not a registered user, I will be offered "This is my organization" claim button
-    When I am on the charity page for "The Organization"
+    When I visit the show page for the organization named "The Organization"
     Then I should see "This is my organization"
     When I click id "TIMO"
     When I click "toggle_link"
diff --git a/features/sign_in_sign_up/sign_up_link_to_org.feature b/features/sign_in_sign_up/sign_up_link_to_org.feature
index 3f41bd44a..d8eef1a91 100644
--- a/features/sign_in_sign_up/sign_up_link_to_org.feature
+++ b/features/sign_in_sign_up/sign_up_link_to_org.feature
@@ -14,14 +14,14 @@ Feature: If new user's email matches an org's email, the new user with have edit
     Given I visit sign up page
     And I sign up as "tester@friendly.org" with password "12345678" and password confirmation "12345678"
     And I sign in as "tester@friendly.org" with password "12345678" via email confirmation
-    And I am on the charity page for "Friendly"
+    And I visit the show page for the organization named "Friendly"
     Then I should not see an edit button for "Friendly" charity
 
   Scenario: Sign up and can edit
     Given I visit sign up page
     And I sign up as "info@friendly.org" with password "12345678" and password confirmation "12345678"
     And I sign in as "info@friendly.org" with password "12345678" via email confirmation
-    And I am on the charity page for "Friendly"
+    And I visit the show page for the organization named "Friendly"
     Then I should see an edit button for "Friendly" charity
 
 # https://github.com/plataformatec/devise/wiki/How-To:-Override-confirmations-so-users-can-pick-their-own-passwords-as-part-of-confirmation-activation
diff --git a/features/step_definitions/authentication_steps.rb b/features/step_definitions/authentication_steps.rb
index 3fe11730a..f7ef694e9 100644
--- a/features/step_definitions/authentication_steps.rb
+++ b/features/step_definitions/authentication_steps.rb
@@ -59,7 +59,7 @@
    | registered_user@example.com | pppppppp | 2007-01-01  10:00:00 |
   }
   steps %Q{
-    Given I am on the home page
+    Given I visit the home page
     And I sign in as "registered_user@example.com" with password "pppppppp"
   }
 end
@@ -88,10 +88,6 @@
   expect(page).to have_button('signup')
 end
 
-Given(/^I am on the password reset page$/) do
-  visit edit_user_password_path(reset_password_token: "18217tiegi1qwea")
-end
-
 When(/^I sign in as "(.*?)" with password "(.*?)" via email confirmation$/) do |email, password|
   user = User.find_by_email("#{email}")
   user.confirm!
diff --git a/features/step_definitions/navigation_steps.rb b/features/step_definitions/navigation_steps.rb
index c4aea6b39..74503b8fd 100644
--- a/features/step_definitions/navigation_steps.rb
+++ b/features/step_definitions/navigation_steps.rb
@@ -23,7 +23,7 @@ def paths(location, params = {})
   }[location]
 end
 
-Then /^I visit the (.*) page?$/ do |location|
+Then /^I visit the (.*) page$/ do |location|
   location.downcase!
   raise "No matching path found for #{location}" if paths(location).nil?
   visit paths(location)
@@ -36,6 +36,12 @@ def paths(location, params = {})
   visit paths(location, params)
 end
 
+Then /^I visit the (edit|show) page for the (.*?) named "(.*?)"$/ do |action, object, name|
+  record = eval("#{object.camelize}.find_by_name('#{name}')")
+  visit url_for controller: object.pluralize.underscore, action: action, id: record.id
+end
+
+
 Then /^I visit the (.*) page for organization "(.*?)"$/ do |location, organization|
   org = Organization.find_by_name organization
   case location
diff --git a/features/volunteer_opportunities/create_volunteer_opportunities.feature b/features/volunteer_opportunities/create_volunteer_opportunities.feature
index 529ca6db6..75bb00d73 100644
--- a/features/volunteer_opportunities/create_volunteer_opportunities.feature
+++ b/features/volunteer_opportunities/create_volunteer_opportunities.feature
@@ -20,7 +20,7 @@ Feature: Org admin creating a volunteer work opportunity
 
   Scenario: Org-owners can see a Create Volunteer Opportunity button on their organization show page
     Given I am signed in as a charity worker related to "Friendly"
-    And I am on the charity page for "Friendly"
+    And I visit the show page for the organization named "Friendly"
     And I click "Create a Volunteer Opportunity"
     Then I should be on the new volunteer opportunity page for organization "Friendly"
 
diff --git a/spec/requests/organizations_spec.rb b/spec/requests/organizations_spec.rb
index ae84c540e..81e81cfa1 100644
--- a/spec/requests/organizations_spec.rb
+++ b/spec/requests/organizations_spec.rb
@@ -5,11 +5,5 @@
     it "works! (now write some real specs)" do
       get organizations_path
     end
-
-    it 'test' do
-      get edit_user_password_path
-      debugger
-      puts 'hi'
-    end
   end
 end

From 15932c5ebe2714cf9e216bb690b60c2c331f8884 Mon Sep 17 00:00:00 2001
From: johnnymo87 <johnnymo87@gmail.com>
Date: Thu, 24 Apr 2014 21:45:05 +0100
Subject: [PATCH 03/14] need reboot

---
 .../admin/admin_edit_static_pages.feature     |  8 +--
 features/admin/admin_new_charity.feature      |  8 +--
 features/admin/admin_promoting_site.feature   |  6 +-
 features/admin/navbar.feature                 |  2 +-
 .../manage_charity_admins.feature             |  4 +-
 features/cookie-policy.feature                | 20 +++----
 features/disclaimer.feature                   | 28 ++++-----
 features/display_project_contributors.feature |  4 +-
 features/home_page/category.feature           |  4 +-
 .../infinite_scrolling_pagination.feature     |  6 +-
 .../local_resident_seeking_support.feature    |  8 +--
 features/home_page/map.feature                |  8 +--
 .../sort_charities_by_update_time.feature     |  4 +-
 .../edit_donation_info.feature                |  4 +-
 .../edit_form_tooltips.feature                |  2 +-
 .../edit_own_charity_profile.feature          |  6 +-
 .../password_retrieval.feature                |  2 +-
 features/sign_in_sign_up/sign_in.feature      |  2 +-
 features/sign_in_sign_up/sign_up.feature      |  6 +-
 .../sign_up_link_to_org.feature               |  4 +-
 features/staticpages.feature                  | 42 ++++++-------
 .../step_definitions/authentication_steps.rb  | 10 ++++
 features/step_definitions/basic_steps.rb      | 12 ++--
 .../step_definitions/contributors_steps.rb    |  5 --
 features/step_definitions/navigation_steps.rb | 60 ++++++++-----------
 .../create_volunteer_opportunities.feature    | 10 ++--
 26 files changed, 131 insertions(+), 144 deletions(-)

diff --git a/features/admin/admin_edit_static_pages.feature b/features/admin/admin_edit_static_pages.feature
index c9229941e..4657a6ffe 100644
--- a/features/admin/admin_edit_static_pages.feature
+++ b/features/admin/admin_edit_static_pages.feature
@@ -33,7 +33,7 @@ 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"
@@ -41,13 +41,13 @@ Feature: I want to be able to edit static pages
 
   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"
@@ -69,7 +69,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
index d965f0131..208f40bb5 100644
--- 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 organisation 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
@@ -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
index 05a1b4562..1393e259b 100644
--- 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
index 8cb05a869..c67bc2d8a 100644
--- a/features/admin/navbar.feature
+++ b/features/admin/navbar.feature
@@ -11,7 +11,7 @@ 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 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/user_reports/manage_charity_admins.feature b/features/admin/user_reports/manage_charity_admins.feature
index 54ca30a46..c4c333538 100644
--- 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
index 2c43a2915..18fc4a20e 100644
--- a/features/cookie-policy.feature
+++ b/features/cookie-policy.feature
@@ -5,20 +5,14 @@ Feature: Approve cookies
   Tracker story ID: https://www.pivotaltracker.com/story/show/56438038
 
   Background:
-    Given I visit the password reset page with params:
-      | key                  | value           |
-      | reset password token | 18217tiegi1qwea |
-    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
\ No newline at end of file
diff --git a/features/disclaimer.feature b/features/disclaimer.feature
index 147d51c7b..1326c58c4 100644
--- a/features/disclaimer.feature
+++ b/features/disclaimer.feature
@@ -4,24 +4,24 @@ 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        |
-    | Friendly Charity | 83 pinner road |
-  Given the following pages exist:
-    | name       | permalink  | content                                                   |
-    | 404        | 404        | We're sorry, but we couldn't find the page you requested! |
-    | Disclaimer | disclaimer | We disclaim everything!                                   |
+    Given the following organizations exist:
+      | name             | address        |
+      | Friendly Charity | 83 pinner road |
+    Given the following pages exist:
+      | name       | permalink  | content                                                   |
+      | 404        | 404        | We're sorry, but we couldn't find the page you requested! |
+      | Disclaimer | disclaimer | We disclaim everything!                                   |
 
   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
index 719fb5d28..9dc7812c8 100644
--- a/features/display_project_contributors.feature
+++ b/features/display_project_contributors.feature
@@ -8,7 +8,7 @@ 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"
@@ -16,7 +16,7 @@ Scenario: Display project contributors
   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
index 2be088aa2..3da9183f0 100644
--- a/features/home_page/category.feature
+++ b/features/home_page/category.feature
@@ -24,7 +24,7 @@ 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"
@@ -32,7 +32,7 @@ Feature: Categories of charities
 
     # 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
index 02549254e..c22e7074c 100644
--- a/features/home_page/infinite_scrolling_pagination.feature
+++ b/features/home_page/infinite_scrolling_pagination.feature
@@ -7,7 +7,7 @@ Feature: Pagination with Infinite Scrolling
 @javascript
 Scenario: Only 4 organizations are visible on the first page
   Given I have created 4 organizations
-  And I am on the home page
+  And I visit the home page
   Then I should see a list of 4 organizations on the index page
   When I scroll down the organizations list
   Then I should see a list of 4 organizations on the index page
@@ -15,7 +15,7 @@ Scenario: Only 4 organizations are visible on the first page
 @javascript
 Scenario: Scrolling down gives more scenarios
   Given I have created 11 organizations
-  And I am on the home page
+  And I visit the home page
   Then I should see a list of 5 organizations on the index page
   When I scroll down the organizations list
   Then I should see a list of 10 organizations on the index page
@@ -25,7 +25,7 @@ Scenario: Scrolling down gives more scenarios
 @javascript
 Scenario: Searching gives results in a paginated form
   Given I have created 25 organizations
-  And I am on the home page
+  And I visit the home page
   When I search for "e"
   Then I should see a list of 5 organizations on the search page with query "e"
   When I scroll down the organizations list
diff --git a/features/home_page/local_resident_seeking_support.feature b/features/home_page/local_resident_seeking_support.feature
index c71cead44..b07c2b686 100644
--- a/features/home_page/local_resident_seeking_support.feature
+++ b/features/home_page/local_resident_seeking_support.feature
@@ -15,7 +15,7 @@ Background: organizations have been added to database
 # particularly want to provide visibility to organizations with no existing web presence
 @javascript
 Scenario: Find help with care for elderly
-  Given I am on the home page
+  Given I visit the home page
   When I search for "elderly"
   Then I should see contact details for "Indian Elders Association" and "Age UK"
   And I should see "Indian Elders Association"
@@ -26,16 +26,16 @@ Scenario: Find help with care for elderly
 # starting within main site
 @javascript
 Scenario: Find a bereavement counsellor
-  Given I am on the home page
+  Given I visit the home page
   When I search for "Bereavement Counselling"
   Then I should see contact details for "Harrow Bereavement Counselling"
   Then I should not see the no results message
 
 Scenario: Find friendly no search results message
-  Given I am on the home page
+  Given I visit the home page
   When I search for "non-existent results"
   Then I should see the no results message
-  Given I am on the home page
+  Given I visit the home page
   Then I should not see the no results message
 
 # starting with web search
diff --git a/features/home_page/map.feature b/features/home_page/map.feature
index e289e2970..0b00c0b9d 100644
--- a/features/home_page/map.feature
+++ b/features/home_page/map.feature
@@ -18,7 +18,7 @@ Background:
 @show
 @javascript
 Scenario: Show all charities on homepage map
-  Given I am on the home page
+  Given I visit the home page
   Then I should see contact details for "Indian Elders Association", "Age UK" and "Harrow Bereavement Counselling"
   #And show me the page
   And I should see "Indian Elders Association", "Age UK" and "Harrow Bereavement Counselling" in the map centered on local organizations
@@ -26,17 +26,17 @@ Scenario: Show all charities on homepage map
 #@javascript
 # TODO work out how to do testing on gmap
 Scenario: Clickable hyperlinks to charity homepage in map
-  Given I am on the home page
+  Given I visit the home page
   And I should see hyperlinks for "Indian Elders Association", "Age UK" and "Harrow Bereavement Counselling" in the map
 
 Scenario: Changing address on the map changes the map coordinates
-    Given I am on the home page
+    Given I visit the home page
     Then the coordinates for "Harrow Bereavement Counselling" and "Youth UK" should not be the same
     And the coordinates for "Age UK" and "Youth UK" should be the same
     Given cookies are approved
     When I am signed in as a charity worker related to "Youth UK"
     And I update "Youth UK" charity address to be "34 pinner road"
-    And I am on the home page
+    And I visit the home page
     Then the coordinates for "Harrow Bereavement Counselling" and "Youth UK" should be the same
     Then the coordinates for "Age UK" and "Youth UK" should not be the same
 
diff --git a/features/home_page/sort_charities_by_update_time.feature b/features/home_page/sort_charities_by_update_time.feature
index 4e32e53fe..2bd5683bd 100644
--- a/features/home_page/sort_charities_by_update_time.feature
+++ b/features/home_page/sort_charities_by_update_time.feature
@@ -14,12 +14,12 @@ Background: organizations have been added to database
 
 Scenario: Most recently updated charity shows at the top of the list 
   Given I update the "Harrow Elders Association" 
-  And I am on the home page
+  And I visit the home page
   Then I should see "Harrow Elders Association" before "Age UK"
   And I should see "Harrow Age UK" before "Harrow Bereavement Counselling"
  
 Scenario: Most recently updated charity shows at the top of the list 
-  Given I am on the home page
+  Given I visit the home page
   Then I should see "Harrow Elders Association" before "Harrow Bereavement Counselling"
   And I should see "Harrow Age UK" before "Harrow Elders Association"
   When I update the "Harrow Elders Association"
diff --git a/features/individual_charity_pages/edit_donation_info.feature b/features/individual_charity_pages/edit_donation_info.feature
index 95981bbc2..a1930a616 100644
--- a/features/individual_charity_pages/edit_donation_info.feature
+++ b/features/individual_charity_pages/edit_donation_info.feature
@@ -27,9 +27,9 @@ Scenario: Successfully change the donation url for a charity
   # Charity Admins can edit their charity's donation info url
 
   #TODO: Refactor the sign in process to dry it out
-  Given I am on the home page
+  Given I visit the home page
   And I sign in as "registered_user@example.com" with password "pppppppp"
-  Given I am on the edit charity page for "Friendly"
+  Given I visit the edit page for the organization named "Friendly"
   And I edit the donation url to be "http://www.friendly.com/donate"
   And I press "Update Organisation"
   Then I should be on the charity page for "Friendly"
diff --git a/features/individual_charity_pages/edit_form_tooltips.feature b/features/individual_charity_pages/edit_form_tooltips.feature
index 608ad3849..b9a51334b 100644
--- a/features/individual_charity_pages/edit_form_tooltips.feature
+++ b/features/individual_charity_pages/edit_form_tooltips.feature
@@ -17,7 +17,7 @@ Feature:  Tool tip instructions for fields on edit form
 
   Scenario: Display tooltip for each label on the edit form
     Given I am signed in as a charity worker related to "Harrow Bereavement Counselling"
-    And I am on the edit charity page for "Harrow Bereavement Counselling"
+    And I visit the edit page for the organization named "Harrow Bereavement Counselling"
     Then the following tooltips should exist: 
       | label                                                |  tooltip        |
       | Address                                              |  Enter a complete address  |
diff --git a/features/individual_charity_pages/edit_own_charity_profile.feature b/features/individual_charity_pages/edit_own_charity_profile.feature
index 3dbb25bfb..c8d06a541 100644
--- a/features/individual_charity_pages/edit_own_charity_profile.feature
+++ b/features/individual_charity_pages/edit_own_charity_profile.feature
@@ -30,7 +30,7 @@ Scenario: Successfully change the address of a charity
 
 Scenario Outline: Successfully mark a field of a charity as public or private
   Given I am signed in as a charity worker related to "Friendly"
-  And I am on the edit charity page for "Friendly"
+  And I visit the edit page for the organization named "Friendly"
   And the <field> for "Friendly" has been marked hidden
   And I <check_state> "<field_checkbox>"
   And I press "Update Organisation"
@@ -53,7 +53,7 @@ Examples:
 #  Given I furtively update "Friendly" charity address to be "30 pinner road"
 #  Then I should see "You don't have permission"
 #  And I should be on the charity page for "Friendly"
-#  Given I am on the home page
+#  Given I visit the home page
 #  Then the coordinates for "Nice" and "Friendly" should not be the same
 
 Scenario: Do not see edit button as non-admin not associated with Friendly
@@ -74,7 +74,7 @@ Scenario: Change the address of a charity when Google is indisposed
   And I visit the show page for the organization named "Friendly"
 #  TODO possible follow on if we could have the request re-issued on next page load
 #  Given Google is no longer indisposed
-#  And I am on the home page
+#  And I visit the home page
 #  Then the coordinates for "Friendly" should be correct
 #  Then show me the page
 
diff --git a/features/sign_in_sign_up/password_retrieval.feature b/features/sign_in_sign_up/password_retrieval.feature
index 44b25f5a0..27fcab173 100644
--- a/features/sign_in_sign_up/password_retrieval.feature
+++ b/features/sign_in_sign_up/password_retrieval.feature
@@ -16,7 +16,7 @@ Feature: Password retrieval
 
     And cookies are approved
 
-    Given I am on the home page
+    Given I visit the home page
     And I follow "Forgot your password?"
     And the email queue is clear
 
diff --git a/features/sign_in_sign_up/sign_in.feature b/features/sign_in_sign_up/sign_in.feature
index 909a0deee..12a812514 100644
--- a/features/sign_in_sign_up/sign_in.feature
+++ b/features/sign_in_sign_up/sign_in.feature
@@ -14,7 +14,7 @@ Background:
     | normal_user@example.com   | pppppppp |       |              | 2007-01-01  10:00:00 |
     | site_admin@example.com    | pppppppp | true  |              | 2007-01-01  10:00:00 |
     | charity_owner@example.com | pppppppp | false | Friendly     | 2007-01-01  10:00:00 |
-  Given I am on the home page
+  Given I visit the home page
   And cookies are approved
 
 Scenario: Sign in for an existing non-admin user unassociated with any organization
diff --git a/features/sign_in_sign_up/sign_up.feature b/features/sign_in_sign_up/sign_up.feature
index c48885095..5f5801503 100644
--- a/features/sign_in_sign_up/sign_up.feature
+++ b/features/sign_in_sign_up/sign_up.feature
@@ -13,21 +13,21 @@ Background:
   And cookies are approved
 @email
 Scenario: Sign up for an existing user
-  Given I visit sign up page
+  Given I visit the sign up page
   And I sign up as "existent-user1@example.com" with password "pppppppp" and password confirmation "pppppppp"
   Then I should see "Email has already been taken"
   And I should not receive an email
   
 @email
 Scenario: Sign up for an non-existent user with non-matching password confirmation
-  Given I visit sign up page
+  Given I visit the sign up page
   And I sign up as "existent-user2@example.com" with password "pppppppp" and password confirmation "aaaaaaaa"
   Then I should see "Password doesn't match confirmation"
   And I should not receive an email
   
 @email
 Scenario: Sign up for a non-existent user
-  Given I visit sign up page
+  Given I visit the sign up page
   And I sign up as "non-existent-user@example.com" with password "pppppppp" and password confirmation "pppppppp"
   Then I should be on the home page
   And I should see "A message with a confirmation link has been sent to your email address. Please open the link to activate your account."
diff --git a/features/sign_in_sign_up/sign_up_link_to_org.feature b/features/sign_in_sign_up/sign_up_link_to_org.feature
index d8eef1a91..0652583ea 100644
--- a/features/sign_in_sign_up/sign_up_link_to_org.feature
+++ b/features/sign_in_sign_up/sign_up_link_to_org.feature
@@ -11,14 +11,14 @@ Feature: If new user's email matches an org's email, the new user with have edit
     And cookies are approved
 
   Scenario: Sign up and CANNOT edit
-    Given I visit sign up page
+    Given I visit the sign up page
     And I sign up as "tester@friendly.org" with password "12345678" and password confirmation "12345678"
     And I sign in as "tester@friendly.org" with password "12345678" via email confirmation
     And I visit the show page for the organization named "Friendly"
     Then I should not see an edit button for "Friendly" charity
 
   Scenario: Sign up and can edit
-    Given I visit sign up page
+    Given I visit the sign up page
     And I sign up as "info@friendly.org" with password "12345678" and password confirmation "12345678"
     And I sign in as "info@friendly.org" with password "12345678" via email confirmation
     And I visit the show page for the organization named "Friendly"
diff --git a/features/staticpages.feature b/features/staticpages.feature
index 856ab8aba..67705a830 100644
--- a/features/staticpages.feature
+++ b/features/staticpages.feature
@@ -4,34 +4,34 @@ Feature: I want to have a contact and about us link in all the app pages
   I want to show a contact page and an about us page
   Tracker story ID: https://www.pivotaltracker.com/story/show/45693625
 
-Background: organizations have been added to database
-  Given the following organizations exist:
-    | name             | address        |
-    | Friendly Charity | 83 pinner road |
-  Given the following pages exist:
-    | name         | permalink  | content                                                   |
-    | 404          | 404        | We're sorry, but we couldn't find the page you requested! |
-    | About Us     | about      | abc123                                                    |
-    | Contact Info | contact    | def456                                                    |
+  Background: organizations have been added to database
+    Given the following organizations exist:
+      | name             | address        |
+      | Friendly Charity | 83 pinner road |
+    Given the following pages exist:
+      | name         | permalink | content                                                   |
+      | 404          | 404       | We're sorry, but we couldn't find the page you requested! |
+      | About Us     | about     | abc123                                                    |
+      | Contact Info | contact   | def456                                                    |
 
   Scenario Outline: the about us page is accessible on all pages
-    Given I am on the <page>
+    Given I visit the <page>
     When I follow "About Us"
     Then I should see "abc123"
   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" |
 
   Scenario Outline: the contact page is accessible on all pages
-    Given I am on the <page>
+    Given I visit the <page>
     When I follow "Contact"
     Then I should see "def456"
   Examples:
-    | page                                |
-    | home page                           |
-    | charity search page                 |
-    | new charity page                    |
-    | charity page for "Friendly Charity" |
\ No newline at end of file
+    | page                                                    |
+    | home page                                               |
+    | organisations index page                                |
+    | new organisation page                                   |
+    | show page for the organization named "Friendly Charity" |
\ No newline at end of file
diff --git a/features/step_definitions/authentication_steps.rb b/features/step_definitions/authentication_steps.rb
index f7ef694e9..1c4cc9c10 100644
--- a/features/step_definitions/authentication_steps.rb
+++ b/features/step_definitions/authentication_steps.rb
@@ -122,6 +122,16 @@
   visit password_url(user.reset_password_token)
 end
 
+Given(/^I receive a new password for "(.*?)"$/) do |email|
+  steps %Q{
+    Given I visit the home page
+    And I follow "Forgot your password?"
+    And I fill in "user_retrieval_email" with "#{email}" within the main body
+    And I press "Send me reset password instructions"
+    And I click on the retrieve password link in the email to "#{email}"
+  }
+end
+
 Given(/^I click on the invitation link in the email to "([^\"]+)"$/) do |email|
   user = User.find_by_email email
   visit invitation_url(user.invitation_token)
diff --git a/features/step_definitions/basic_steps.rb b/features/step_definitions/basic_steps.rb
index a0bed7eea..dc267a7ea 100644
--- a/features/step_definitions/basic_steps.rb
+++ b/features/step_definitions/basic_steps.rb
@@ -10,7 +10,7 @@
   within('#menuAdmin > ul.dropdown-menu') do
     find('a', text: link).should_not be_nil
     click_link link
-    current_path.should eq paths[link.downcase]
+    current_path.should eq paths(link.downcase)
   end
 end
 
@@ -26,7 +26,7 @@
 end
 
 And /^I add "(.*?)" as an admin for "(.*?)" charity$/ do |admin_email, charity|
-  steps %Q{ And I am on the edit charity page for "#{charity}"}
+  steps %Q{ And I visit the edit page for the organization named "#{charity}"}
   fill_in 'organization_admin_email_to_add', :with => admin_email
   steps %Q{
   And I press "Update Organisation"}
@@ -86,7 +86,7 @@
 end
 Given /^I update "(.*?)" charity address to be "(.*?)"( when Google is indisposed)?$/ do |name, address, indisposed|
   steps %Q{
-    Given I am on the charity page for "#{name}"
+    Given I visit the show page for the organization named "#{name}"
     And I follow "Edit"
     And I edit the charity address to be "#{address}" #{indisposed ? 'when Google is indisposed':''}
     And I press "Update Organisation"
@@ -95,7 +95,7 @@
 
 Given /^I update "(.*?)" charity website to be "(.*?)"$/ do |name, url|
   steps %Q{
-    Given I am on the charity page for "#{name}"
+    Given I visit the show page for the organization named "#{name}"
     And I follow "Edit"
     And I edit the charity website to be "#{url}"
     And I press "Update Organisation"
@@ -104,7 +104,7 @@
 
 Given /^I have created a new organization$/ do
   steps %Q{
-    Given I am on the home page
+    Given I visit the home page
     And I follow "New Organization"
     And I fill in the new charity page validly
     And I press "Create Organisation"
@@ -130,7 +130,7 @@
 
 Then /^the website link for "(.*?)" should have a protocol$/ do |name|
   steps %{
-    Given I am on the charity page for "#{name}"
+    Given I visit the show page for the organization named "#{name}"
   }
    website = Organization.find_by_name(name).website
    website.should =~ /^http\:\/\//
diff --git a/features/step_definitions/contributors_steps.rb b/features/step_definitions/contributors_steps.rb
index 4ce44ff0d..496a35107 100644
--- a/features/step_definitions/contributors_steps.rb
+++ b/features/step_definitions/contributors_steps.rb
@@ -1,8 +1,3 @@
-Given(/^I am on the contributors page$/) do
-  visit contributors_path
-end
-
-
 Given(/^the following contributors exist:$/) do |c_table|
   @contributors = Array.new
   c_table.hashes.each do |contributor|
diff --git a/features/step_definitions/navigation_steps.rb b/features/step_definitions/navigation_steps.rb
index 74503b8fd..7176c7d40 100644
--- a/features/step_definitions/navigation_steps.rb
+++ b/features/step_definitions/navigation_steps.rb
@@ -12,6 +12,7 @@ def paths(location, params = {})
       'sign up' => new_user_registration_path(params),
       'sign in' => new_user_session_path(params),
       'organisations index' => organizations_path(params),
+      'new organisation' => new_organization_path(params),
       'contributors' => contributors_path(params),
       'password reset' => edit_user_password_path(params),
       'invitation' => accept_user_invitation_path(params),
@@ -19,16 +20,11 @@ def paths(location, params = {})
       'all users' => users_report_path(params),
       'invited users' => invited_users_report_path(params),
       'volunteer opportunities' => volunteer_ops_path(params),
-      'new organisation' => new_organization_path(params)
+      'new organisation' => new_organization_path(params),
+      'contributors' => contributors_path(params)
   }[location]
 end
 
-Then /^I visit the (.*) page$/ do |location|
-  location.downcase!
-  raise "No matching path found for #{location}" if paths(location).nil?
-  visit paths(location)
-end
-
 Then /^I visit the (.*) page with params:$/ do |location, table|
   params = Hash[table.rows]
   location.downcase!
@@ -36,34 +32,35 @@ def paths(location, params = {})
   visit paths(location, params)
 end
 
-Then /^I visit the (edit|show) page for the (.*?) named "(.*?)"$/ do |action, object, name|
-  record = eval("#{object.camelize}.find_by_name('#{name}')")
-  visit url_for controller: object.pluralize.underscore, action: action, id: record.id
+Then /^I should be on the (.*) page with params:$/ do |location, table|
+  params = Hash[table.rows]
+  location.downcase!
+  raise "No matching path found for #{location}" if paths(location).nil?
+  current_path.should eq paths(location, params)
 end
 
-
-Then /^I visit the (.*) page for organization "(.*?)"$/ do |location, organization|
-  org = Organization.find_by_name organization
-  case location
-    when "new volunteer opportunity" then visit new_volunteer_op_path
-    when "show volunteer opportunity" then visit volunteer_op_path(org)
-    else raise "No matching path found for #{location}!"
-  end
+Then /^I visit the (.*) page$/ do |location|
+  location.downcase!
+  raise "No matching path found for #{location}" if paths(location).nil?
+  visit paths(location)
 end
 
 Then /^I should be on the (.*) page$/ do |location|
   location = location.downcase
-  raise "No matching path found for #{location}" if paths[location].nil?
-  current_path.should eq paths[location]
+  raise "No matching path found for #{location}" if paths(location).nil?
+  current_path.should eq paths(location)
 end
 
-Then /^I should be on the (.*) page for organization "(.*?)"$/ do |location, organization|
-  org = Organization.find_by_name organization
-  case location
-    when "new volunteer opportunity" then current_path.should == new_volunteer_op_path
-    when "show volunteer opportunity" then current_path.should == volunteer_op_path(org)
-    else raise "No matching path found for #{location}!"
-  end
+Then /^I visit the (edit|show) page for the (.*?) (named|titled) "(.*?)"$/ do |action, object, schema, name|
+  schema.chomp!('d')
+  record = eval("#{object.camelize}.find_by_#{schema}('#{name}')")
+  visit url_for controller: object.pluralize.underscore, action: action, id: record.id
+end
+
+Then /^I should be on the (edit|show) page for the (.*?) (named|titled) "(.*?)"$/ do |action, object, schema, name|
+  schema.chomp!('d')
+  record = eval("#{object.camelize}.find_by_#{schema}('#{name}')")
+  current_path.should eq url_for controller: object.pluralize.underscore, action: action, id: record.id
 end
 
 Given(/^I try to access "(.*?)" page$/) do |page|
@@ -87,7 +84,6 @@ def paths(location, params = {})
   end
 end
 
-
 Then(/^the response status should be 404$/) do
   page.status_code.should == 404
   #page.response_code.should be 404
@@ -115,10 +111,6 @@ def paths(location, params = {})
   click_link(link)
 end
 
-Given /^I am on the charity search page$/ do
-  visit organizations_search_path
-end
-
 Then /^I should be on the charity page for "(.*?)"$/ do |charity_name|
   charity = Organization.find_by_name(charity_name)
   expect(current_path).to eq(organization_path charity.id)
@@ -192,10 +184,6 @@ def paths(location, params = {})
   wait_for_ajax
 end
 
-Given(/^I am on the volunteer opportunities page$/) do
-  visit '/volunteer_ops'
-end
-
 Then(/^navbar button "(.*?)" should( not)? be active$/) do |button_text, negative|
   expectation_method = negative ? :should_not : :should
   within('.nav.nav-pills.pull-right') do |buttons|
diff --git a/features/volunteer_opportunities/create_volunteer_opportunities.feature b/features/volunteer_opportunities/create_volunteer_opportunities.feature
index 75bb00d73..b1a9428ff 100644
--- a/features/volunteer_opportunities/create_volunteer_opportunities.feature
+++ b/features/volunteer_opportunities/create_volunteer_opportunities.feature
@@ -22,21 +22,21 @@ Feature: Org admin creating a volunteer work opportunity
     Given I am signed in as a charity worker related to "Friendly"
     And I visit the show page for the organization named "Friendly"
     And I click "Create a Volunteer Opportunity"
-    Then I should be on the new volunteer opportunity page for organization "Friendly"
+    Then I should be on the new volunteer opportunity page
 
   Scenario: Org-owner creating a volunteer opportunity
     Given I am signed in as a charity worker related to "Friendly"
-    And I visit the new volunteer opportunity page for organization "Friendly"
+    And I visit the new volunteer opportunity page
     And I should see "Create a new Volunteer Opportunity"
     And I submit an opportunity with title "Hard Work" and description "For no pay"
-    Then I should be on the show volunteer opportunity page for organization "Friendly"
+    Then I should be on the show volunteer_op page for organization "Friendly"
     And I should see "Hard Work"
     And I should see "For no pay"
     And I should see "Organisation: Friendly"
 
   Scenario: Only org-owners can create volunteer opportunities
     # Tested that the API is restricted in the request spec
-    Given I am on the charity page for "Friendly"
+    Given I visit the show page for the organization named "Friendly"
     Then I should not see a link with text "Create a Volunteer Opportunity"
 
   Scenario: Signed in users who don't own the org cannot create volunteer opportunities
@@ -46,6 +46,6 @@ Feature: Org admin creating a volunteer work opportunity
 
   Scenario: Admin users who don't own the org cannot create volunteer opportunities
     Given I am signed in as a admin
-    And I am on the charity page for "Friendly"
+    And I visit the show page for the organization named "Friendly"
     Then I should not see a link with text "Create a Volunteer Opportunity"
 

From e284c47b7d241965de36e3c8fe074ff5a5632a12 Mon Sep 17 00:00:00 2001
From: johnnymo87 <johnnymo87@gmail.com>
Date: Fri, 25 Apr 2014 02:35:56 +0100
Subject: [PATCH 04/14] finished refactoring cuke navigation

---
 features/admin/admin_edit_charity.feature     |  6 +-
 .../charity_page.feature                      | 19 +++--
 .../step_definitions/authentication_steps.rb  | 17 ++--
 features/step_definitions/basic_steps.rb      |  1 +
 features/step_definitions/navigation_steps.rb | 85 +++++--------------
 .../create_volunteer_opportunities.feature    |  2 +-
 6 files changed, 41 insertions(+), 89 deletions(-)

diff --git a/features/admin/admin_edit_charity.feature b/features/admin/admin_edit_charity.feature
index e78786361..340802750 100644
--- 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/individual_charity_pages/charity_page.feature b/features/individual_charity_pages/charity_page.feature
index e531e7a8b..13ab318fe 100644
--- a/features/individual_charity_pages/charity_page.feature
+++ b/features/individual_charity_pages/charity_page.feature
@@ -6,9 +6,9 @@ Feature: Web page owned by each charity
 
   Background: organizations have been added to database
     Given the following organizations exist:
-      | name           | description               | address        | postcode | telephone | website              | email              |
-      | Friendly       | Bereavement Counselling   | 34 pinner road | HA1 4HZ  | 020800000 | http://friendly.org  | admin@friendly.xx  |
-      | Friendly Clone | Quite Friendly!           | 30 pinner road |          | 020800010 |                      |                    |
+      | name       | description             | address        | postcode | telephone | website             | email             |
+      | Friendly   | Bereavement Counselling | 34 pinner road | HA1 4HZ  | 020800000 | http://friendly.org | admin@friendly.xx |
+      | Unfriendly | Bunch of jerks          | 30 pinner road |          | 020800010 |                     |                   |
     Given the following users are registered:
       | email                         | password | organization | confirmed_at         |
       | registered_user-1@example.com | pppppppp | Friendly     | 2007-01-01  10:00:00 |
@@ -28,15 +28,18 @@ Feature: Web page owned by each charity
     Then I should see "<label>"
   Examples:
     | label    |
-    |Postcode  |
-    |Email     |
+    | Postcode |
+    | Email    |
+    | Website  |
 
   Scenario Outline: hide labels if field is empty
+    Given I visit the show page for the organization named "Unfriendly"
     Then I should not see "<label>"
-    Examples:
+  Examples:
     | label    |
-    |Postcode  |
-    |Email     |
+    | Postcode |
+    | Email    |
+    | Website  |
 
 
 
diff --git a/features/step_definitions/authentication_steps.rb b/features/step_definitions/authentication_steps.rb
index 1c4cc9c10..62f9ac96c 100644
--- a/features/step_definitions/authentication_steps.rb
+++ b/features/step_definitions/authentication_steps.rb
@@ -15,10 +15,12 @@
 end
 
 Given /^I sign up as "(.*?)" with password "(.*?)" and password confirmation "(.*?)"$/ do |email, password, password_confirmation|
-  fill_in "signup_email", :with => email
-  fill_in "signup_password", :with => password
-  fill_in "signup_password_confirmation", :with => password_confirmation
-  click_button "Sign up"
+  within('.dropdown-menu') do
+    fill_in "signup_email", :with => email
+    fill_in "signup_password", :with => password
+    fill_in "signup_password_confirmation", :with => password_confirmation
+    click_button "Sign up"
+  end
 end
 
 Given /^I sign in as a charity worker with permission to edit "(.*?)"$/ do |name|
@@ -81,13 +83,6 @@
   click_link_or_button "Sign in"
 end
 
-Given /^I visit the sign up page$/ do
-  step "I visit the home page"
-  expect(page).to have_field('signup_email')
-  expect(page).to have_field('signup_password')
-  expect(page).to have_button('signup')
-end
-
 When(/^I sign in as "(.*?)" with password "(.*?)" via email confirmation$/) do |email, password|
   user = User.find_by_email("#{email}")
   user.confirm!
diff --git a/features/step_definitions/basic_steps.rb b/features/step_definitions/basic_steps.rb
index dc267a7ea..7bc99a9f7 100644
--- a/features/step_definitions/basic_steps.rb
+++ b/features/step_definitions/basic_steps.rb
@@ -357,6 +357,7 @@ def check_contact_details(name)
   page.body.should have_content(email)
   click_link 'Approve'
 end
+
 Then(/^"(.*?)" is a charity admin of "(.*?)"$/) do |user_email, org_name|
   user = User.find_by_email(user_email)
   org = Organization.find_by_name(org_name)
diff --git a/features/step_definitions/navigation_steps.rb b/features/step_definitions/navigation_steps.rb
index 7176c7d40..9bd74c744 100644
--- a/features/step_definitions/navigation_steps.rb
+++ b/features/step_definitions/navigation_steps.rb
@@ -6,39 +6,26 @@
   visit path
 end
 
-def paths(location, params = {})
+def paths(location)
   {
-      'home' => root_path(params),
-      'sign up' => new_user_registration_path(params),
-      'sign in' => new_user_session_path(params),
-      'organisations index' => organizations_path(params),
-      'new organisation' => new_organization_path(params),
-      'contributors' => contributors_path(params),
-      'password reset' => edit_user_password_path(params),
-      'invitation' => accept_user_invitation_path(params),
-      'organisations without users' => organizations_report_path(params),
-      'all users' => users_report_path(params),
-      'invited users' => invited_users_report_path(params),
-      'volunteer opportunities' => volunteer_ops_path(params),
-      'new organisation' => new_organization_path(params),
-      'contributors' => contributors_path(params)
+      'home' => root_path,
+      'sign up' => new_user_registration_path,
+      'sign in' => new_user_session_path,
+      'organisations index' => organizations_path,
+      'new organisation' => new_organization_path,
+      'contributors' => contributors_path,
+      'password reset' => edit_user_password_path,
+      'invitation' => accept_user_invitation_path,
+      'organisations without users' => organizations_report_path,
+      'all users' => users_report_path,
+      'invited users' => invited_users_report_path,
+      'volunteer opportunities' => volunteer_ops_path,
+      'new volunteer opportunity' => new_volunteer_op_path,
+      'new organisation' => new_organization_path,
+      'contributors' => contributors_path
   }[location]
 end
 
-Then /^I visit the (.*) page with params:$/ do |location, table|
-  params = Hash[table.rows]
-  location.downcase!
-  raise "No matching path found for #{location}" if paths(location).nil?
-  visit paths(location, params)
-end
-
-Then /^I should be on the (.*) page with params:$/ do |location, table|
-  params = Hash[table.rows]
-  location.downcase!
-  raise "No matching path found for #{location}" if paths(location).nil?
-  current_path.should eq paths(location, params)
-end
-
 Then /^I visit the (.*) page$/ do |location|
   location.downcase!
   raise "No matching path found for #{location}" if paths(location).nil?
@@ -46,7 +33,7 @@ def paths(location, params = {})
 end
 
 Then /^I should be on the (.*) page$/ do |location|
-  location = location.downcase
+  location.downcase!
   raise "No matching path found for #{location}" if paths(location).nil?
   current_path.should eq paths(location)
 end
@@ -54,17 +41,13 @@ def paths(location, params = {})
 Then /^I visit the (edit|show) page for the (.*?) (named|titled) "(.*?)"$/ do |action, object, schema, name|
   schema.chomp!('d')
   record = eval("#{object.camelize}.find_by_#{schema}('#{name}')")
-  visit url_for controller: object.pluralize.underscore, action: action, id: record.id
+  visit url_for only_path: true, controller: object.pluralize.underscore, action: action, id: record.id
 end
 
 Then /^I should be on the (edit|show) page for the (.*?) (named|titled) "(.*?)"$/ do |action, object, schema, name|
   schema.chomp!('d')
   record = eval("#{object.camelize}.find_by_#{schema}('#{name}')")
-  current_path.should eq url_for controller: object.pluralize.underscore, action: action, id: record.id
-end
-
-Given(/^I try to access "(.*?)" page$/) do |page|
-  visit("/#{page}")
+  current_path.should eq url_for only_path: true, controller: object.pluralize.underscore, action: action, id: record.id
 end
 
 And(/^the page should be titled "(.*?)"$/) do |title|
@@ -111,11 +94,6 @@ def paths(location, params = {})
   click_link(link)
 end
 
-Then /^I should be on the charity page for "(.*?)"$/ do |charity_name|
-  charity = Organization.find_by_name(charity_name)
-  expect(current_path).to eq(organization_path charity.id)
-end
-
 Then /^following Disclaimer link should display Disclaimer$/ do
   steps %Q{
     When I follow "Disclaimer"
@@ -124,30 +102,6 @@ def paths(location, params = {})
   }
 end
 
-Then /^I should be on the new charity page$/ do
- current_path.should == new_organization_path
-end
-
-Given /^I am on the charity page for "(.*?)"$/ do |name1|
-  org1 = Organization.find_by_name(name1)
-  visit organization_path org1.id
-  within('#content') do
-    page.should have_css('#column1.span6')
-    page.should have_css('#column2.span6')
-  end
-end
-
-Given /^I am on the edit charity page for "(.*?)"$/ do |name1|
-  org1 = Organization.find_by_name(name1)
-  visit organization_path org1.id
-  click_link 'Edit'
-end
-
-Given /^I am furtively on the edit charity page for "(.*?)"$/ do |name|
-  org = Organization.find_by_name(name)
-  visit edit_organization_path org.id
-end
-
 Given(/^I am on the edit page with the "(.*?)" permalink$/) do |permalink|
   pg = Page.find_by_permalink(permalink)
   visit edit_page_path pg.permalink
@@ -178,7 +132,6 @@ def paths(location, params = {})
   Capybara.javascript_driver
 end
 
-
 And(/^I click tableheader "([^"]*)"$/) do |name|
   find('th', :text => "#{name}").click
   wait_for_ajax
diff --git a/features/volunteer_opportunities/create_volunteer_opportunities.feature b/features/volunteer_opportunities/create_volunteer_opportunities.feature
index b1a9428ff..698a41194 100644
--- a/features/volunteer_opportunities/create_volunteer_opportunities.feature
+++ b/features/volunteer_opportunities/create_volunteer_opportunities.feature
@@ -29,7 +29,7 @@ Feature: Org admin creating a volunteer work opportunity
     And I visit the new volunteer opportunity page
     And I should see "Create a new Volunteer Opportunity"
     And I submit an opportunity with title "Hard Work" and description "For no pay"
-    Then I should be on the show volunteer_op page for organization "Friendly"
+    Then I should be on the show page for the volunteer_op titled "Friendly"
     And I should see "Hard Work"
     And I should see "For no pay"
     And I should see "Organisation: Friendly"

From 7841f2a1f55833aea7191c2a182e2e7dffa88b8b Mon Sep 17 00:00:00 2001
From: johnnymo87 <johnnymo87@gmail.com>
Date: Fri, 25 Apr 2014 02:43:28 +0100
Subject: [PATCH 05/14] clean up

---
 features/admin/organization_reports/without_users.feature   | 4 ++--
 .../individual_charity_pages/edit_donation_info.feature     | 2 +-
 .../edit_own_charity_profile.feature                        | 6 +++---
 features/individual_charity_pages/this-is-my-org.feature    | 6 +++---
 features/step_definitions/basic_steps.rb                    | 3 ---
 .../create_volunteer_opportunities.feature                  | 2 +-
 6 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/features/admin/organization_reports/without_users.feature b/features/admin/organization_reports/without_users.feature
index efed5558b..f761f10fe 100644
--- 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/individual_charity_pages/edit_donation_info.feature b/features/individual_charity_pages/edit_donation_info.feature
index a1930a616..80a8b440b 100644
--- a/features/individual_charity_pages/edit_donation_info.feature
+++ b/features/individual_charity_pages/edit_donation_info.feature
@@ -32,7 +32,7 @@ Scenario: Successfully change the donation url for a charity
   Given I visit the edit page for the organization named "Friendly"
   And I edit the donation url to be "http://www.friendly.com/donate"
   And I press "Update Organisation"
-  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 "Organization was successfully updated"
   And the donation_info URL for "Friendly" should refer to "http://www.friendly.com/donate"
 
diff --git a/features/individual_charity_pages/edit_own_charity_profile.feature b/features/individual_charity_pages/edit_own_charity_profile.feature
index c8d06a541..f9deb945e 100644
--- a/features/individual_charity_pages/edit_own_charity_profile.feature
+++ b/features/individual_charity_pages/edit_own_charity_profile.feature
@@ -26,7 +26,7 @@ Scenario: Successfully add website url without protocol
 Scenario: Successfully change the address of a charity
   Given I am signed in as a charity worker related to "Friendly"
   And I update "Friendly" charity address to be "30 pinner road"
-  Then I should be on the charity page for "Friendly"
+  Then I should be on the show page for the organization named "Friendly"
 
 Scenario Outline: Successfully mark a field of a charity as public or private
   Given I am signed in as a charity worker related to "Friendly"
@@ -34,7 +34,7 @@ Scenario Outline: Successfully mark a field of a charity as public or private
   And the <field> for "Friendly" has been marked hidden
   And I <check_state> "<field_checkbox>"
   And I press "Update Organisation"
-  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 <visibility> "<field_contents>"
   And I should <visibility> "<field_label>"
 Examples:
@@ -79,7 +79,7 @@ Scenario: Change the address of a charity when Google is indisposed
 #  Then show me the page
 
 Scenario: Redirected to sign-in when not signed-in and edit donation url
-  Given I am furtively on the edit charity page for "Friendly"
+  Given I visit the edit page for the organization named "Friendly"
   Then I should be on the sign in page
 # TODO after sign in is take the user back to the edit page
 
diff --git a/features/individual_charity_pages/this-is-my-org.feature b/features/individual_charity_pages/this-is-my-org.feature
index 2eaaa3255..a06d58c72 100644
--- a/features/individual_charity_pages/this-is-my-org.feature
+++ b/features/individual_charity_pages/this-is-my-org.feature
@@ -17,7 +17,7 @@ Feature: This is my organization
     When I visit the show page for the organization named "The Organization"
     Then I should see a link or button "This is my organization"
     And I click "This is my organization"
-    Then I should be on the charity page for "The Organization"
+    Then I should be on the show page for the organization named "The Organization"
     And "nonadmin@myorg.com"'s request status for "The Organization" should be updated appropriately
 
   @javascript
@@ -25,9 +25,9 @@ Feature: This is my organization
     When I visit the show page for the organization named "The Organization"
     Then I should see "This is my organization"
     When I click id "TIMO"
-    Then I should be on the charity page for "The Organization"
+    Then I should be on the show page for the organization named "The Organization"
     When I sign in as "nonadmin@myorg.com" with password "mypassword1234"
-    Then I should be on the charity page for "The Organization"
+    Then I should be on the show page for the organization named "The Organization"
 
   @javascript
   Scenario: I am not a registered user, I will be offered "This is my organization" claim button
diff --git a/features/step_definitions/basic_steps.rb b/features/step_definitions/basic_steps.rb
index 7bc99a9f7..afa86eced 100644
--- a/features/step_definitions/basic_steps.rb
+++ b/features/step_definitions/basic_steps.rb
@@ -325,9 +325,6 @@ def check_contact_details(name)
     org = Organization.find_by_name(org)
     user.pending_organization_id.should eq org.id
 end
-#Then an email should be sent to "admin@myorg.com"
-#And I should be on the charity page for "#{org}"
-
 
 When(/^the URL should contain "(.*?)"$/) do |string|
   URI.parse(current_url).path.should == '/' + string
diff --git a/features/volunteer_opportunities/create_volunteer_opportunities.feature b/features/volunteer_opportunities/create_volunteer_opportunities.feature
index 698a41194..ac344542d 100644
--- a/features/volunteer_opportunities/create_volunteer_opportunities.feature
+++ b/features/volunteer_opportunities/create_volunteer_opportunities.feature
@@ -41,7 +41,7 @@ Feature: Org admin creating a volunteer work opportunity
 
   Scenario: Signed in users who don't own the org cannot create volunteer opportunities
     Given I am signed in as a charity worker related to "Shy"
-    And I am on the charity page for "Friendly"
+    And I visit the show page for the organization named "Friendly"
     Then I should not see a link with text "Create a Volunteer Opportunity"
 
   Scenario: Admin users who don't own the org cannot create volunteer opportunities

From 74b5969260344112ca3f7a39579442f8624833d6 Mon Sep 17 00:00:00 2001
From: johnnymo87 <johnnymo87@gmail.com>
Date: Fri, 25 Apr 2014 02:47:59 +0100
Subject: [PATCH 06/14] clean up

---
 .../create_volunteer_opportunities.feature                      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/features/volunteer_opportunities/create_volunteer_opportunities.feature b/features/volunteer_opportunities/create_volunteer_opportunities.feature
index ac344542d..1212c411e 100644
--- a/features/volunteer_opportunities/create_volunteer_opportunities.feature
+++ b/features/volunteer_opportunities/create_volunteer_opportunities.feature
@@ -29,7 +29,7 @@ Feature: Org admin creating a volunteer work opportunity
     And I visit the new volunteer opportunity page
     And I should see "Create a new Volunteer Opportunity"
     And I submit an opportunity with title "Hard Work" and description "For no pay"
-    Then I should be on the show page for the volunteer_op titled "Friendly"
+    Then I should be on the show page for the volunteer_op titled "Hard Work"
     And I should see "Hard Work"
     And I should see "For no pay"
     And I should see "Organisation: Friendly"

From 9f2bdfc6d83e74740e8127cea2e8086b6baeefae Mon Sep 17 00:00:00 2001
From: johnnymo87 <johnnymo87@gmail.com>
Date: Fri, 25 Apr 2014 23:28:55 +0100
Subject: [PATCH 07/14] incorporated changes to map & local residents cukes
 from marian

---
 .../user_reports/invited_users_page.feature   |  1 -
 .../infinite_scrolling_pagination.feature     | 32 --------
 .../local_resident_seeking_support.feature    | 73 +++++++++++--------
 features/home_page/map.feature                | 13 ----
 features/step_definitions/basic_steps.rb      | 60 +++++++++------
 features/step_definitions/map_steps.rb        | 71 +++---------------
 features/step_definitions/pagination_steps.rb | 29 --------
 .../list_volunteer_opportunities.feature      | 46 ++++++------
 8 files changed, 109 insertions(+), 216 deletions(-)
 delete mode 100644 features/home_page/infinite_scrolling_pagination.feature
 delete mode 100644 features/step_definitions/pagination_steps.rb

diff --git a/features/admin/user_reports/invited_users_page.feature b/features/admin/user_reports/invited_users_page.feature
index f5a654e4c..664244c97 100644
--- 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/home_page/infinite_scrolling_pagination.feature b/features/home_page/infinite_scrolling_pagination.feature
deleted file mode 100644
index c22e7074c..000000000
--- a/features/home_page/infinite_scrolling_pagination.feature
+++ /dev/null
@@ -1,32 +0,0 @@
-Feature: Pagination with Infinite Scrolling
-  As an local resident
-  So that I can see a list of all the organizations in a paginated form
-  I want to be able to see 5 organizations at first and scroll down to see more
-  Tracker Story ID: https://www.pivotaltracker.com/s/projects/742821/stories/51382275
-
-@javascript
-Scenario: Only 4 organizations are visible on the first page
-  Given I have created 4 organizations
-  And I visit the home page
-  Then I should see a list of 4 organizations on the index page
-  When I scroll down the organizations list
-  Then I should see a list of 4 organizations on the index page
-
-@javascript
-Scenario: Scrolling down gives more scenarios
-  Given I have created 11 organizations
-  And I visit the home page
-  Then I should see a list of 5 organizations on the index page
-  When I scroll down the organizations list
-  Then I should see a list of 10 organizations on the index page
-  When I scroll down the organizations list
-  Then I should see a list of 11 organizations on the index page
-
-@javascript
-Scenario: Searching gives results in a paginated form
-  Given I have created 25 organizations
-  And I visit the home page
-  When I search for "e"
-  Then I should see a list of 5 organizations on the search page with query "e"
-  When I scroll down the organizations list
-  Then I should see a list of 10 organizations on the search page with query "e"
diff --git a/features/home_page/local_resident_seeking_support.feature b/features/home_page/local_resident_seeking_support.feature
index b07c2b686..07d6846be 100644
--- a/features/home_page/local_resident_seeking_support.feature
+++ b/features/home_page/local_resident_seeking_support.feature
@@ -4,39 +4,52 @@ Feature: Local Resident seeking Support
   I want to find contact details for a local service specific to my need
   Tracker story ID: https://www.pivotaltracker.com/story/show/43946779
 
-Background: organizations have been added to database
-  
-  Given the following organizations exist:
-  | name                            | description                      | address        | postcode | website       |
-  | Harrow Bereavement Counselling  | Harrow Bereavement Counselling   | 34 pinner road | HA1 4HZ  | http://a.com/ |
-  | Indian Elders Association       | Care for the elderly             | 64 pinner road | HA1 4HA  | http://b.com/ |
-  | Age UK                          | Care for the Elderly             | 84 pinner road | HA1 4HF  | http://c.com/ |
+  Background: organizations have been added to database
+
+    Given the following organizations exist:
+      | name                           | description                  | address        | postcode | website       |
+      | Harrow Bereavement Counselling | Counselling for the bereaved | 34 pinner road | HA1 4HZ  | http://a.com/ |
+      | Indian Elders Association      | Care for the elderly         | 64 pinner road | HA1 4HA  | http://b.com/ |
+      | Age UK                         | Care for the Elderly         | 84 pinner road | HA1 4HF  | http://c.com/ |
 
 # particularly want to provide visibility to organizations with no existing web presence
-@javascript
-Scenario: Find help with care for elderly
-  Given I visit the home page
-  When I search for "elderly"
-  Then I should see contact details for "Indian Elders Association" and "Age UK"
-  And I should see "Indian Elders Association"
-  And I should see "Age UK"
-  And I should see search results for "elderly" in the map
-  And the search box should contain "elderly"
+  Scenario: Find help with care for elderly
+    Given I visit the home page
+    When I search for "elderly"
+    Then the index should contain:
+      | Indian Elders Association | Care for the elderly |
+      | Age UK                    | Care for the Elderly |
+    And the index should not contain:
+      | Harrow Bereavement Counselling | Counselling for the bereaved |
+    And the search box should contain "elderly"
 
 # starting within main site
-@javascript
-Scenario: Find a bereavement counsellor
-  Given I visit the home page
-  When I search for "Bereavement Counselling"
-  Then I should see contact details for "Harrow Bereavement Counselling"
-  Then I should not see the no results message
+  Scenario: Find a bereavement counsellor
+    Given I visit the home page
+    When I search for "Bereavement Counselling"
+    And the index should contain:
+      | Harrow Bereavement Counselling | Counselling for the bereaved |
+    Then the index should not contain:
+      | Indian Elders Association | Care for the elderly |
+      | Age UK                    | Care for the Elderly |
+    Then I should not see the no results message
+
+  Scenario: Find friendly no search results message
+    Given I visit the home page
+    When I search for "non-existent results"
+    Then I should see the no results message
+    Given I visit the home page
+    Then I should not see the no results message
 
-Scenario: Find friendly no search results message
-  Given I visit the home page
-  When I search for "non-existent results"
-  Then I should see the no results message
-  Given I visit the home page
-  Then I should not see the no results message
+  Scenario: See a list of current organizations
+    Given I visit the home page
+    And cookies are approved
+    Then the index should contain:
+      | Harrow Bereavement Counselling | Counselling for the bereaved |
+      | Indian Elders Association      | Care for the elderly           |
+      | Age UK                         | Care for the Elderly           |
 
-# starting with web search
-Scenario: Searching Google for "death of a relative"
+  Scenario: Volunteer index page has two column layout
+    Given I visit the home page
+    And cookies are approved
+    Then I should see a two column layout
diff --git a/features/home_page/map.feature b/features/home_page/map.feature
index 0b00c0b9d..a8cc3d8f9 100644
--- a/features/home_page/map.feature
+++ b/features/home_page/map.feature
@@ -15,19 +15,6 @@ Background:
    Given the following users are registered:
   | email             | password | organization | confirmed_at |
   | registered_user-3@example.com | pppppppp | Youth UK  | 2007-01-01  10:00:00 |
-@show
-@javascript
-Scenario: Show all charities on homepage map
-  Given I visit the home page
-  Then I should see contact details for "Indian Elders Association", "Age UK" and "Harrow Bereavement Counselling"
-  #And show me the page
-  And I should see "Indian Elders Association", "Age UK" and "Harrow Bereavement Counselling" in the map centered on local organizations
-
-#@javascript
-# TODO work out how to do testing on gmap
-Scenario: Clickable hyperlinks to charity homepage in map
-  Given I visit the home page
-  And I should see hyperlinks for "Indian Elders Association", "Age UK" and "Harrow Bereavement Counselling" in the map
 
 Scenario: Changing address on the map changes the map coordinates
     Given I visit the home page
diff --git a/features/step_definitions/basic_steps.rb b/features/step_definitions/basic_steps.rb
index afa86eced..91c1e16ae 100644
--- a/features/step_definitions/basic_steps.rb
+++ b/features/step_definitions/basic_steps.rb
@@ -44,7 +44,7 @@
 Then /^I should( not)? see an edit button for "(.*?)" charity$/ do |negate, name|
   expectation_method = negate ? :not_to : :to
   org = Organization.find_by_name name
-  expect(page).send(expectation_method, have_link('Edit',:href => edit_organization_path(org.id)))
+  expect(page).send(expectation_method, have_link('Edit', :href => edit_organization_path(org.id)))
 end
 
 Then /^I should see "(.*?)" in the charity admin email$/ do |email|
@@ -73,7 +73,7 @@
 end
 
 Then /^the contact information should be available$/ do
-   steps %Q{
+  steps %Q{
     When I follow "Contact"
     Then I should see "Contact Info Email us: contact@voluntaryactionharrow.org.uk Phone Us: 020 8861 5894 Write to Us: The Lodge, 64 Pinner Road, Harrow, Middlesex, HA1 4HZ Find Us: On Social Media (Click Here)"
    }
@@ -88,7 +88,7 @@
   steps %Q{
     Given I visit the show page for the organization named "#{name}"
     And I follow "Edit"
-    And I edit the charity address to be "#{address}" #{indisposed ? 'when Google is indisposed':''}
+    And I edit the charity address to be "#{address}" #{indisposed ? 'when Google is indisposed' : ''}
     And I press "Update Organisation"
   }
 end
@@ -120,21 +120,21 @@
 end
 
 Given /^I edit the charity website to be "(.*?)"$/ do |url|
-  fill_in('organization_website',:with => url)
+  fill_in('organization_website', :with => url)
 end
 
 When /^I edit the charity address to be "(.*?)"$/ do |address|
   stub_request_with_address(address)
-  fill_in('organization_address',:with => address)
+  fill_in('organization_address', :with => address)
 end
 
 Then /^the website link for "(.*?)" should have a protocol$/ do |name|
   steps %{
     Given I visit the show page for the organization named "#{name}"
   }
-   website = Organization.find_by_name(name).website
-   website.should =~ /^http\:\/\//
-   expect(page).to have_selector("a[href='#{website}']")
+  website = Organization.find_by_name(name).website
+  website.should =~ /^http\:\/\//
+  expect(page).to have_selector("a[href='#{website}']")
 end
 
 And /^"(.*?)" charity address is "(.*?)"$/ do |name, address|
@@ -142,14 +142,14 @@
   expect(org.address).to eq(address)
 end
 
-Then /^I should see "(.*?)" before "(.*?)"$/ do |name1,name2|
+Then /^I should see "(.*?)" before "(.*?)"$/ do |name1, name2|
   str = page.body
   raise "Expected '#{name1}' first, but instead found '#{name2}' first" unless str.index(name1) < str.index(name2)
 end
 
 Then /^I should see the donation_info URL for "(.*?)"$/ do |name1|
   org1 = Organization.find_by_name(name1)
-  content =  "Donate to #{org1.name} now!"
+  content = "Donate to #{org1.name} now!"
   page.should have_xpath %Q<//a[@href = "#{org1.donation_info}" and @target = "_blank" and contains(.,'#{content}')]>
 end
 
@@ -161,7 +161,7 @@
   expect(page).to have_xpath("//input[@id='q' and @value='#{arg1}']")
 end
 
-Then /^I should( not)? see the no results message$/ do |negate| 
+Then /^I should( not)? see the no results message$/ do |negate|
   expectation_method = negate ? :not_to : :to
   expect(page).send(expectation_method, have_content(SEARCH_NOT_FOUND))
 end
@@ -209,7 +209,7 @@
   end
 end
 
-Then /^I should( not)? see a new organizations link/ do  |negate|
+Then /^I should( not)? see a new organizations link/ do |negate|
   #page.should_not have_link "New Organization", :href => new_organization_path
   #page.should_not have_selector('a').with_attribute href: new_organization_path
   expectation_method = negate ? :not_to : :to
@@ -232,7 +232,7 @@
 
 Then(/^the navbar should( not)? have a link to (.*?)$/) do |negate, link|
   expectation_method = negate ? :not_to : :to
-  within('#navbar') {expect(page).send(expectation_method, have_selector(:link_or_button, link))}
+  within('#navbar') { expect(page).send(expectation_method, have_selector(:link_or_button, link)) }
 end
 
 #Then /^I should( not)? see a button saying "(.*?)"$/ do |negate, name|
@@ -312,18 +312,18 @@ def check_contact_details(name)
 Then(/^"(.*?)" should have email "(.*?)"$/) do |org, email|
   Organization.find_by_name(org).email.should eq email
 end
-Given /^"(.*)"'s request status for "(.*)" should be updated appropriately$/ do |email,org_name|
-    steps %Q{
+Given /^"(.*)"'s request status for "(.*)" should be updated appropriately$/ do |email, org_name|
+  steps %Q{
       And "#{email}"'s request for "#{org_name}" should be persisted
       And I should see "You have requested admin status for #{Organization.find_by_name(org_name).name}"
       And I should not see a link or button "This is my organization"
     }
 end
 
-And /"(.*)"'s request for "(.*)" should be persisted/ do |email,org|
-    user = User.find_by_email(email)
-    org = Organization.find_by_name(org)
-    user.pending_organization_id.should eq org.id
+And /"(.*)"'s request for "(.*)" should be persisted/ do |email, org|
+  user = User.find_by_email(email)
+  org = Organization.find_by_name(org)
+  user.pending_organization_id.should eq org.id
 end
 
 When(/^the URL should contain "(.*?)"$/) do |string|
@@ -366,18 +366,30 @@ def check_contact_details(name)
   page.send(box_state, css)
 end
 
-Given(/^the (.*?) for "(.*?)" has been marked (public|hidden)$/) do |field,name,mode|
+Given(/^the (.*?) for "(.*?)" has been marked (public|hidden)$/) do |field, name, mode|
   org = Organization.find_by_name(name)
   case mode
-    when "hidden" then publish = false
-    when "public" then publish = true
+    when "hidden" then
+      publish = false
+    when "public" then
+      publish = true
   end
   org.send("publish_#{field}=", publish)
   org.save!
 end
+
 Then /^I should( not)? see:$/ do |negative, table|
-    expectation = negative ? :should_not : :should
-    table.rows.flatten.each do |string|
+  expectation = negative ? :should_not : :should
+  table.rows.flatten.each do |string|
     page.send(expectation, have_text(string))
   end
 end
+
+Then /^the index should( not)? contain:$/ do |negative, table|
+  expectation = negative ? :should_not : :should
+  table.raw.flatten.each do |cell|
+    within('#column2') do
+      page.send(expectation, have_text(cell))
+    end
+  end
+end
diff --git a/features/step_definitions/map_steps.rb b/features/step_definitions/map_steps.rb
index 68aa6cb93..14a6bde77 100644
--- a/features/step_definitions/map_steps.rb
+++ b/features/step_definitions/map_steps.rb
@@ -1,77 +1,17 @@
-Then /^I should see hyperlinks for "(.*?)", "(.*?)" and "(.*?)" in the map$/ do |org1, org2, org3|
-  org1 = Organization.find_by_name(org1)
-  org2 = Organization.find_by_name(org2)
-  org3 = Organization.find_by_name(org3)
-  [org1,org2,org3].each do |org|
-    match = page.html.match %Q<{\\"description\\":\\".*>#{org.name}</a>.*\\",\\"lat\\":((?:-|)\\d+\.\\d+),\\"lng\\":((?:-|)\\d+\.\\d+)}>
-    expect(match).not_to be_nil
-    # the following might work if we were actually running all the gmaps js
-    #expect(page).to have_xpath("//div[@class='map_container']//a[@href='#{organization_path(org)}']")
-  end
-end
-
-# could we move maps stuff into separate step file and couldn't these things be DRYer ...
-# e.g. one step to handle 2 or more orgs ...
-Then /^I should see "([^"]*?)", "([^"]*?)" and "([^"]*?)" in the map centered on local organizations$/ do |name1, name2, name3|
-  check_map([name1,name2,name3])
-  page.should have_xpath "//script[contains(.,'Gmaps.map.map_options.auto_adjust = false')]"
-  page.should have_xpath "//script[contains(.,'Gmaps.map.map_options.auto_zoom = true')]"
-  page.should have_xpath "//script[contains(.,'Gmaps.map.map_options.center_latitude = 51.5978')]"
-  page.should have_xpath "//script[contains(.,'Gmaps.map.map_options.center_longitude = -0.337')]"
-  page.should have_xpath "//script[contains(.,'Gmaps.map.map_options.zoom = 12')]"
-  page.should have_xpath "//script[contains(.,'Gmaps.map.map_options.auto_adjust = false')]"
-end
-
-Then /^I should see "([^"]*?)" and "([^"]*?)" in the map$/ do |name1, name2|
-  check_map([name1,name2])
-end
-
-
-def check_map(names)
-  # this is specific to checking for all items when we want a generic one
-  #page.should have_xpath "//script[contains(.,'Gmaps.map.markers = #{Organization.all.to_gmaps4rails}')]"
-
-  names.each do |name|
-    page.should have_xpath "//script[contains(.,'#{name}')]"
-    #org = Organization.find_by_name(name)
-    Organization.all.to_gmaps4rails.should match(name)
-  end
-end
-
-
-Then /^I should see search results for "(.*?)" in the map$/ do |search_terms|
-  orgs = Organization.search_by_keyword(search_terms)
-  orgs.each do |org|
-    matches = page.html.match %Q<{\\"description\\":\\".*>#{org.name}</a>.*\\",\\"lat\\":((?:-|)\\d+\.\\d+),\\"lng\\":((?:-|)\\d+\.\\d+)}>
-    expect(matches).not_to be_nil
-  end
-end
-
 def stub_request_with_address(address, body = nil)
   filename = "#{address.gsub(/\s/, '_')}.json"
   filename = File.read "test/fixtures/#{filename}"
-  # Webmock shows URLs with '%20' standing for space, but uri_encode susbtitutes with '+'
-  # So let's fix
-  addr_in_uri = address.uri_encode.gsub(/\+/, "%20")
-  # Stub request, which URL matches Regex
-  stub_request(:get, /http:\/\/maps.googleapis.com\/maps\/api\/geocode\/json\?address=#{addr_in_uri}/).
+  stub_request(:any, /maps\.googleapis\.com/).
       to_return(status => 200, :body => body || filename, :headers => {})
 end
 
-Given /the following organizations exist/ do |organizations_table|
+Given /^the following organizations exist:$/ do |organizations_table|
   organizations_table.hashes.each do |org|
     stub_request_with_address(org['address'])
     Organization.create! org
   end
 end
 
-Given /the following volunteer opportunities exist/ do |volunteer_ops_table|
-  volunteer_ops_table.hashes.each do |volunteer_op|
-    volunteer_op["organization"] = Organization.find_by_name(volunteer_op["organization"])
-    VolunteerOp.create! volunteer_op, :without_protection => true
-  end
-end
-
 Given /Google is indisposed for "(.*)"/ do  |address|
   body = %Q({
 "results" : [],
@@ -80,6 +20,13 @@ def stub_request_with_address(address, body = nil)
   stub_request_with_address(address, body)
 end
 
+Given /the following volunteer opportunities exist/ do |volunteer_ops_table|
+  volunteer_ops_table.hashes.each do |volunteer_op|
+    volunteer_op["organization"] = Organization.find_by_name(volunteer_op["organization"])
+    VolunteerOp.create! volunteer_op, :without_protection => true
+  end
+end
+
 Given /the following categories exist/ do |categories_table|
   categories_table.hashes.each do |cat|
     Category.create! cat
diff --git a/features/step_definitions/pagination_steps.rb b/features/step_definitions/pagination_steps.rb
deleted file mode 100644
index 3ad47581f..000000000
--- a/features/step_definitions/pagination_steps.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-require 'webmock/cucumber'
-require 'uri-handler'
-
-Given /^I have created (\d+) organizations$/ do |number|
-  number.to_i.times do |n|
-    # TODO some way of stubbing geocode here (I think) to prevent hitting external service - I get
-    # getaddrinfo: nodename nor servname provided, or not known (SocketError)
-    # otherwise ...
-    #Gmaps4rails.stub(:geocode => nil)
-    stub_request_with_address("64 pinner road")
-    FactoryGirl.create(:organization, :name => "org#{n}", :description => "description#{n}")
-  end
-end
-
-Then /^I should see a list of (\d+) organizations on the (index page|search page with query (.+))$/ do |number, page, query|
-  orgs = nil
-  if page == "index page"
-    orgs = Organization.order("updated_at DESC")
-  else
-    orgs = Organization.search_by_keyword($1)
-  end
-  number.to_i.times do |n|
-    check_contact_details orgs[n].name
-  end
-end
-
-When /^I scroll down the organizations list$/ do
-  page.execute_script("$('#orgs_scroll')[0].scrollTop = 100")
-end
\ No newline at end of file
diff --git a/features/volunteer_opportunities/list_volunteer_opportunities.feature b/features/volunteer_opportunities/list_volunteer_opportunities.feature
index 9589f9605..2534cc2b6 100644
--- a/features/volunteer_opportunities/list_volunteer_opportunities.feature
+++ b/features/volunteer_opportunities/list_volunteer_opportunities.feature
@@ -3,36 +3,32 @@ Feature: As a member of the public
   I would like to see a list of volunteer opportunities
   Tracker story ID: https://www.pivotaltracker.com/story/show/66059724
 
-Background: organizations with volunteer opportunities have been added to database
-  
-  Given the following organizations exist:
-  | name                            | description                      | address        | postcode | website       |
-  | Cats Are Us                     | Animal Shelter                   | 34 pinner road | HA1 4HZ  | http://a.com/ |
-  | Indian Elders Association       | Care for the elderly             | 64 pinner road | HA1 4HA  | http://b.com/ |
-  Given the following volunteer opportunities exist:
-  | title                           | description                        | organization              |
-  | Litter Box Scooper              | Assist with feline sanitation      | Cats Are Us               |
-  | Office Support                  | Help with printing and copying.    | Indian Elders Association | 
+  Background: organizations with volunteer opportunities have been added to database
 
-@javascript
+    Given the following organizations exist:
+      | name                      | description          | address        | postcode | website       |
+      | Cats Are Us               | Animal Shelter       | 34 pinner road | HA1 4HZ  | http://a.com/ |
+      | Indian Elders Association | Care for the elderly | 64 pinner road | HA1 4HA  | http://b.com/ |
+    Given the following volunteer opportunities exist:
+      | title              | description                     | organization              |
+      | Litter Box Scooper | Assist with feline sanitation   | Cats Are Us               |
+      | Office Support     | Help with printing and copying. | Indian Elders Association |
 
-Scenario Outline: Top navbar has links to Volunteers and Organisations 
-  Given I visit the home page
-  Then the navbar should have a link to <link>
-Examples:
-  | link          |
-  | Volunteers    |
-  | Organisations |
+  Scenario Outline: Top navbar has links to Volunteers and Organisations
+    Given I visit the home page
+    Then the navbar should have a link to <link>
+  Examples:
+    | link          |
+    | Volunteers    |
+    | Organisations |
 
-Scenario: See a list of current volunteer opportunities
+  Scenario: See a list of current volunteer opportunities
     Given I visit the volunteer opportunities page
-    And cookies are approved
     Then I should see:
-    | title                           | description                        | organization              |
-    | Litter Box Scooper              | Assist with feline sanitation      | Cats Are Us               |
-    | Office Support                  | Help with printing and copying.    | Indian Elders Association |
-  
+      | title              | description                     | organization              |
+      | Litter Box Scooper | Assist with feline sanitation   | Cats Are Us               |
+      | Office Support     | Help with printing and copying. | Indian Elders Association |
+
   Scenario: Volunteer index page has two column layout
     Given I visit the volunteer opportunities page
-    And cookies are approved
     Then I should see a two column layout

From fa6565063b28f011ce9a415169c50503338d88f5 Mon Sep 17 00:00:00 2001
From: johnnymo87 <johnnymo87@gmail.com>
Date: Fri, 25 Apr 2014 23:52:06 +0100
Subject: [PATCH 08/14] cleaned up contributors steps

---
 .../step_definitions/contributors_steps.rb     | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/features/step_definitions/contributors_steps.rb b/features/step_definitions/contributors_steps.rb
index 496a35107..c6721f146 100644
--- a/features/step_definitions/contributors_steps.rb
+++ b/features/step_definitions/contributors_steps.rb
@@ -1,19 +1,13 @@
-Given(/^the following contributors exist:$/) do |c_table|
-  @contributors = Array.new
-  c_table.hashes.each do |contributor|
-    @contributors << contributor
-  end
-  stub_request(:get, 'https://api.github.com/repos/tansaku/LocalSupport/contributors')
-  .to_return(:body => @contributors.to_json)
+Given(/^the following contributors exist:$/) do |contributors|
+  @contributors = contributors.hashes
+  stub_request(:any, /api\.github\.com/).to_return(:body => @contributors.to_json)
 end
 
 
 Then(/^I should see a link avatar for "([^"]*)"$/) do |name|
-  @contributor = (@contributors.find do |contributor|
-    contributor['login'] == name
-  end)
-  avatar = @contributor['avatar_url']
-  link = @contributor['html_url']
+  contributor = @contributors.find { |ctrb| ctrb['login'] == name }
+  avatar = contributor['avatar_url']
+  link = contributor['html_url']
   page.should have_css("a[href='#{link}'] img[src='#{avatar}']")
 end
 

From 6111ee0d6788456dd2345463202dd493bc84d748 Mon Sep 17 00:00:00 2001
From: johnnymo87 <johnnymo87@gmail.com>
Date: Sat, 26 Apr 2014 01:03:01 +0100
Subject: [PATCH 09/14] shuffled the location of some step defs

---
 .../step_definitions/authentication_steps.rb  | 31 -------
 features/step_definitions/basic_steps.rb      | 85 +++++++------------
 features/step_definitions/email_steps.rb      | 29 ++-----
 .../{map_steps.rb => factory_steps.rb}        | 44 +++-------
 4 files changed, 50 insertions(+), 139 deletions(-)
 rename features/step_definitions/{map_steps.rb => factory_steps.rb} (54%)

diff --git a/features/step_definitions/authentication_steps.rb b/features/step_definitions/authentication_steps.rb
index 62f9ac96c..547d4dfb3 100644
--- a/features/step_definitions/authentication_steps.rb
+++ b/features/step_definitions/authentication_steps.rb
@@ -23,37 +23,6 @@
   end
 end
 
-Given /^I sign in as a charity worker with permission to edit "(.*?)"$/ do |name|
-  org = Organization.find_by_name name
-  org.users # TODO we will want some habtm to support this eventually
-end
-
-And /^I am signed in as the admin using password "(.*?)"$/ do |password|
-  admin = User.find_by_admin(true)
-  steps %Q{
-    Given I visit the sign in page
-    And I sign in as "#{admin.email}" with password "#{password}"
-  }
-end
-
-And /^I am not signed in as the admin using password "(.*?)"$/ do |password|
-  admin = User.find_by_admin(false)
-  steps %Q{
-    Given I visit the sign in page
-    And I sign in as "#{admin.email}" with password "#{password}"
-  }
-end
-
-#TODO: Should we bypass mass assgiment in the creation via :without_protection?
-Given /^the following users are registered:$/ do |users_table|
-  users_table.hashes.each do |user|
-    user["admin"] = user["admin"] == "true"
-    user["organization"] = Organization.find_by_name(user["organization"])
-    user["pending_organization"] = Organization.find_by_name(user["pending_organization"])
-    worker = User.create! user, :without_protection => true
-  end
-end
-
 Given /^that I am logged in as any user$/ do
   steps %Q{
      Given the following users are registered:
diff --git a/features/step_definitions/basic_steps.rb b/features/step_definitions/basic_steps.rb
index 91c1e16ae..35e41d7d8 100644
--- a/features/step_definitions/basic_steps.rb
+++ b/features/step_definitions/basic_steps.rb
@@ -57,10 +57,6 @@
   save_and_open_page
 end
 
-Given /^PENDING/ do
-  pending
-end
-
 When /^I search for "(.*?)"$/ do |text|
   fill_in 'q', with: text
   click_button 'Submit'
@@ -187,6 +183,10 @@
   page.should_not have_content org1.address
 end
 
+Given /^I edit the donation url to be "(.*?)"$/ do |url|
+  fill_in('organization_donation_info', :with => url)
+end
+
 Then /^I should not see any edit or delete links$/ do
   page.should_not have_link "Edit"
   page.should_not have_link "Destroy"
@@ -221,10 +221,6 @@
   expect(page).send(expectation_method, have_content(text))
 end
 
-#Then /^I should not see "(.*?)"$/ do |text|
-#  page.should_not have_content text
-#end
-
 Then(/^I should( not)? see a link or button "(.*?)"$/) do |negate, link|
   expectation_method = negate ? :not_to : :to
   expect(page).send(expectation_method, have_selector(:link_or_button, link))
@@ -235,27 +231,6 @@
   within('#navbar') { expect(page).send(expectation_method, have_selector(:link_or_button, link)) }
 end
 
-#Then /^I should( not)? see a button saying "(.*?)"$/ do |negate, name|
-#  expectation_method = negate ? :not_to : :to
-#  expect(page).send(expectation_method, have_button("#{name}"))
-#end
-
-# this could be DRYed out (next three methods)
-Then /^I should see contact details for "([^"]*?)"$/ do |text|
-  check_contact_details text
-end
-
-Then /^I should see contact details for "([^"]*?)" and "(.*?)"$/ do |text1, text2|
-  check_contact_details text1
-  check_contact_details text2
-end
-
-Then /^I should see contact details for "([^"]*?)", "([^"]*?)" and "(.*?)"$/ do |text1, text2, text3|
-  check_contact_details text1
-  check_contact_details text2
-  check_contact_details text3
-end
-
 Given /^I edit the charity address to be "(.*?)" when Google is indisposed$/ do |address|
   body = %Q({
 "results" : [],
@@ -273,12 +248,6 @@
   Organization.find_by_name(name).address.should == address
 end
 
-def check_contact_details(name)
-  org = Organization.find_by_name(name)
-  page.should have_link name, :href => organization_path(org.id)
-  page.should have_content smart_truncate(org.description)
-end
-
 When /^I fill in "(.*?)" with "(.*?)" within the navbar$/ do |field, value|
   within('#navbar') { fill_in(field, :with => value) }
 end
@@ -295,23 +264,10 @@ def check_contact_details(name)
   expect(Organization.find_by_name name).to be_nil
 end
 
-Then /^I debug$/ do
-  debugger
-  0
-end
-
-And(/^a file exists:$/) do |table|
-  CSV.open("db/email_test.csv", "wb") do |csv|
-    csv << table.hashes[0].keys
-    table.hashes.each do |org|
-      csv << org.values
-    end
-  end
-end
-
 Then(/^"(.*?)" should have email "(.*?)"$/) do |org, email|
   Organization.find_by_name(org).email.should eq email
 end
+
 Given /^"(.*)"'s request status for "(.*)" should be updated appropriately$/ do |email, org_name|
   steps %Q{
       And "#{email}"'s request for "#{org_name}" should be persisted
@@ -368,12 +324,7 @@ def check_contact_details(name)
 
 Given(/^the (.*?) for "(.*?)" has been marked (public|hidden)$/) do |field, name, mode|
   org = Organization.find_by_name(name)
-  case mode
-    when "hidden" then
-      publish = false
-    when "public" then
-      publish = true
-  end
+  publish = mode == 'hidden' ? false : true
   org.send("publish_#{field}=", publish)
   org.save!
 end
@@ -393,3 +344,27 @@ def check_contact_details(name)
     end
   end
 end
+
+And(/^"(.*?)" should not have nil coordinates$/) do |name|
+  org = Organization.find_by_name(name)
+  org.latitude.should_not be_nil
+  org.longitude.should_not be_nil
+end
+
+Then /^the coordinates for "(.*?)" and "(.*?)" should( not)? be the same/ do | org1_name, org2_name, negation|
+  #Gmaps.map.markers = [{"description":"<a href=\"/organizations/1320\">test</a>","lat":50.3739788,"lng":-95.84172219999999}];
+
+  matches = page.html.match %Q<{\\"description\\":\\"[^}]*#{org1_name}[^}]*\\",\\"lat\\":((?:-|)\\d+\.\\d+),\\"lng\\":((?:-|)\\d+\.\\d+)}>
+  org1_lat = matches[1]
+  org1_lng = matches[2]
+  matches = page.html.match %Q<{\\"description\\":\\"[^}]*#{org2_name}[^}]*\\",\\"lat\\":((?:-|)\\d+\.\\d+),\\"lng\\":((?:-|)\\d+\.\\d+)}>
+  org2_lat = matches[1]
+  org2_lng = matches[2]
+  lat_same = org1_lat == org2_lat
+  lng_same = org1_lng == org2_lng
+  if negation
+    expect(lat_same && lng_same).to be_false
+  else
+    expect(lat_same && lng_same).to be_true
+  end
+end
diff --git a/features/step_definitions/email_steps.rb b/features/step_definitions/email_steps.rb
index 61c74bc93..70b484fd9 100644
--- a/features/step_definitions/email_steps.rb
+++ b/features/step_definitions/email_steps.rb
@@ -4,14 +4,6 @@
   ActionMailer::Base.deliveries.size.should eq 1
 end
 
-And(/^an email with subject line "([^"]*)" should have been sent$/) do |arg|
-  @email = ActionMailer::Base.deliveries.last
-  @email.subject.should include(arg)
-  #@email.cc.should_not be_nil
-  #@email.cc.include('technical@harrowcn.org.uk')     # we want this but not clear how to do with invitation
-  ActionMailer::Base.deliveries.size.should eq 1
-end
-
 And /^I should not receive an email$/ do
   ActionMailer::Base.deliveries.size.should eq 0
 end
@@ -29,18 +21,11 @@
   @rake['db:import:emails'].invoke(file)
 end
 
-# attemping to copy https://github.com/mtc2013/LocalSupport/blob/targeted_invites/features/step_definitions/email_steps.rb
-require 'rake'
-Given(/^I run the "(.*?)" rake task located at "(.*?)"$/) do |task, loc|
-  @rake = Rake::Application.new
-  Rake.application = @rake
-  # HACK TO BE FIXED.
-  # This require fails second time around (usually in cucumber batch test)
-  # because file is added to loaded list, and then can't be re-required
-  # however this has side effect of not adding the files tasks to @rake
-  # by explicitly overriding the loaded list we force a reload and get the
-  # tasks pulled in - not sure what other side effects there might be
-  Rake.application.rake_require loc, ['lib/'], ''
-  Rake::Task.define_task(:environment)
-  @rake[task].invoke
+Given /Google is indisposed for "(.*)"/ do |address|
+  body = %Q({
+"results" : [],
+"status" : "OVER_QUERY_LIMIT"
+})
+  stub_request_with_address(address, body)
 end
+
diff --git a/features/step_definitions/map_steps.rb b/features/step_definitions/factory_steps.rb
similarity index 54%
rename from features/step_definitions/map_steps.rb
rename to features/step_definitions/factory_steps.rb
index 14a6bde77..5f9d3a20f 100644
--- a/features/step_definitions/map_steps.rb
+++ b/features/step_definitions/factory_steps.rb
@@ -12,12 +12,13 @@ def stub_request_with_address(address, body = nil)
   end
 end
 
-Given /Google is indisposed for "(.*)"/ do  |address|
-  body = %Q({
-"results" : [],
-"status" : "OVER_QUERY_LIMIT"
-})
-  stub_request_with_address(address, body)
+Given /^the following users are registered:$/ do |users_table|
+  users_table.hashes.each do |user|
+    user["admin"] = user["admin"] == "true"
+    user["organization"] = Organization.find_by_name(user["organization"])
+    user["pending_organization"] = Organization.find_by_name(user["pending_organization"])
+    User.create! user, :without_protection => true
+  end
 end
 
 Given /the following volunteer opportunities exist/ do |volunteer_ops_table|
@@ -51,30 +52,11 @@ def stub_request_with_address(address, body = nil)
   Page.create!({:name => name, :permalink => permalink, :content => content})
 end
 
-Given /^I edit the donation url to be "(.*?)"$/ do |url|
-  fill_in('organization_donation_info', :with => url)
-end
-
-And(/^"(.*?)" should not have nil coordinates$/) do |name|
-  org = Organization.find_by_name(name)
-  org.latitude.should_not be_nil
-  org.longitude.should_not be_nil
-end
-
-Then /^the coordinates for "(.*?)" and "(.*?)" should( not)? be the same/ do | org1_name, org2_name, negation|
-  #Gmaps.map.markers = [{"description":"<a href=\"/organizations/1320\">test</a>","lat":50.3739788,"lng":-95.84172219999999}];
-
-  matches = page.html.match %Q<{\\"description\\":\\"[^}]*#{org1_name}[^}]*\\",\\"lat\\":((?:-|)\\d+\.\\d+),\\"lng\\":((?:-|)\\d+\.\\d+)}>
-  org1_lat = matches[1]
-  org1_lng = matches[2]
-  matches = page.html.match %Q<{\\"description\\":\\"[^}]*#{org2_name}[^}]*\\",\\"lat\\":((?:-|)\\d+\.\\d+),\\"lng\\":((?:-|)\\d+\.\\d+)}>
-  org2_lat = matches[1]
-  org2_lng = matches[2]
-  lat_same = org1_lat == org2_lat
-  lng_same = org1_lng == org2_lng
-  if negation
-    expect(lat_same && lng_same).to be_false
-  else
-    expect(lat_same && lng_same).to be_true
+And(/^a file exists:$/) do |table|
+  CSV.open("db/email_test.csv", "wb") do |csv|
+    csv << table.hashes[0].keys
+    table.hashes.each do |org|
+      csv << org.values
+    end
   end
 end

From 41898f761115f3106f3ad7bf4e9704b7ef3502fb Mon Sep 17 00:00:00 2001
From: johnnymo87 <johnnymo87@gmail.com>
Date: Fri, 2 May 2014 15:50:28 +0100
Subject: [PATCH 10/14] changed cuke wording to match new definitions

---
 .../admin/acknowledging_contributors_site.feature    | 12 ++++++------
 features/admin/admin_edit_static_pages.feature       |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/features/admin/acknowledging_contributors_site.feature b/features/admin/acknowledging_contributors_site.feature
index 85facf85c..41b6bb3a3 100644
--- 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_static_pages.feature b/features/admin/admin_edit_static_pages.feature
index 21cb32a62..3dd440bde 100644
--- a/features/admin/admin_edit_static_pages.feature
+++ b/features/admin/admin_edit_static_pages.feature
@@ -56,7 +56,7 @@ Feature: I want to be able to edit static 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"

From ccfbab3b4300fa67272ffb4ee825d5b53d06ecef Mon Sep 17 00:00:00 2001
From: johnnymo87 <johnnymo87@gmail.com>
Date: Wed, 7 May 2014 03:19:13 +0100
Subject: [PATCH 11/14] Dried out logic duplication between 'visit' and 'should
 be on' page matchers

---
 features/step_definitions/navigation_steps.rb | 49 ++++++++++++-------
 1 file changed, 30 insertions(+), 19 deletions(-)

diff --git a/features/step_definitions/navigation_steps.rb b/features/step_definitions/navigation_steps.rb
index 9bd74c744..091caa46e 100644
--- a/features/step_definitions/navigation_steps.rb
+++ b/features/step_definitions/navigation_steps.rb
@@ -26,28 +26,40 @@ def paths(location)
   }[location]
 end
 
-Then /^I visit the (.*) page$/ do |location|
+Then /^I (visit|should be on) the (.*) page$/ do |mode, location|
   location.downcase!
   raise "No matching path found for #{location}" if paths(location).nil?
-  visit paths(location)
-end
-
-Then /^I should be on the (.*) page$/ do |location|
-  location.downcase!
-  raise "No matching path found for #{location}" if paths(location).nil?
-  current_path.should eq paths(location)
-end
-
-Then /^I visit the (edit|show) page for the (.*?) (named|titled) "(.*?)"$/ do |action, object, schema, name|
-  schema.chomp!('d')
-  record = eval("#{object.camelize}.find_by_#{schema}('#{name}')")
-  visit url_for only_path: true, controller: object.pluralize.underscore, action: action, id: record.id
+  case mode
+    when 'visit' then visit paths(location)
+    when 'should be on' then current_path.should eq paths(location)
+    else raise "unknown mode '#{mode}'"
+  end
 end
 
-Then /^I should be on the (edit|show) page for the (.*?) (named|titled) "(.*?)"$/ do |action, object, schema, name|
-  schema.chomp!('d')
-  record = eval("#{object.camelize}.find_by_#{schema}('#{name}')")
-  current_path.should eq url_for only_path: true, controller: object.pluralize.underscore, action: action, id: record.id
+def find_record_for(object, schema, name)
+  # all types begin as strings
+  real_object = object.classify.constantize
+  schema = schema.chomp('d').to_sym
+  real_object.where(schema => name).first
+end
+
+Then /^I (visit|should be on) the (edit|show) page for the (.*?) (named|titled) "(.*?)"$/ do |mode, action, object, schema, name|
+  record = find_record_for(object, schema, name)
+  case mode
+    when 'visit' then visit url_for({
+                                        only_path: true,
+                                        controller: object.pluralize.underscore,
+                                        action: action,
+                                        id: record.id
+                                    })
+    when 'should be on' then current_path.should eq url_for({
+                                                                only_path: true,
+                                                                controller: object.pluralize.underscore,
+                                                                action: action,
+                                                                id: record.id
+                                                            })
+    else raise "unknown mode '#{mode}'"
+  end
 end
 
 And(/^the page should be titled "(.*?)"$/) do |title|
@@ -69,7 +81,6 @@ def paths(location)
 
 Then(/^the response status should be 404$/) do
   page.status_code.should == 404
-  #page.response_code.should be 404
 end
 
 Then(/^I should be on the edit page for "(.*?)"$/) do |permalink|

From b5faf2e3a3d4cbae5cb6e22b2c2e9e35cc3e6785 Mon Sep 17 00:00:00 2001
From: johnnymo87 <johnnymo87@gmail.com>
Date: Wed, 7 May 2014 04:28:39 +0100
Subject: [PATCH 12/14] nav changes

---
 features/step_definitions/navigation_steps.rb | 34 ++++++++-----------
 1 file changed, 15 insertions(+), 19 deletions(-)

diff --git a/features/step_definitions/navigation_steps.rb b/features/step_definitions/navigation_steps.rb
index 091caa46e..4d5e18550 100644
--- a/features/step_definitions/navigation_steps.rb
+++ b/features/step_definitions/navigation_steps.rb
@@ -45,19 +45,15 @@ def find_record_for(object, schema, name)
 
 Then /^I (visit|should be on) the (edit|show) page for the (.*?) (named|titled) "(.*?)"$/ do |mode, action, object, schema, name|
   record = find_record_for(object, schema, name)
+  url = url_for({
+                    only_path: true,
+                    controller: object.pluralize.underscore,
+                    action: action,
+                    id: record.id
+                })
   case mode
-    when 'visit' then visit url_for({
-                                        only_path: true,
-                                        controller: object.pluralize.underscore,
-                                        action: action,
-                                        id: record.id
-                                    })
-    when 'should be on' then current_path.should eq url_for({
-                                                                only_path: true,
-                                                                controller: object.pluralize.underscore,
-                                                                action: action,
-                                                                id: record.id
-                                                            })
+    when 'visit' then visit url
+    when 'should be on' then current_path.should eq url
     else raise "unknown mode '#{mode}'"
   end
 end
@@ -107,10 +103,10 @@ def find_record_for(object, schema, name)
 
 Then /^following Disclaimer link should display Disclaimer$/ do
   steps %Q{
-    When I follow "Disclaimer"
-    Then I should see "Disclaimer"
-    And I should see "Whilst Voluntary Action Harrow has made effort to ensure the information here is accurate and up to date we are reliant on the information provided by the different organisations. No guarantees for the accuracy of the information is made."
-  }
+When I follow "Disclaimer"
+Then I should see "Disclaimer"
+And I should see "Whilst Voluntary Action Harrow has made effort to ensure the information here is accurate and up to date we are reliant on the information provided by the different organisations. No guarantees for the accuracy of the information is made."
+}
 end
 
 Given(/^I am on the edit page with the "(.*?)" permalink$/) do |permalink|
@@ -124,7 +120,7 @@ def find_record_for(object, schema, name)
 
   #regex = /height: 0/ # Assume style="height: 0px;" is the only means of invisibility
   #style = page.find("##{id}")['style']
-  #sleep 0.25 if style   # need to give js a moment to modify the DOM
+  #sleep 0.25 if style # need to give js a moment to modify the DOM
   #expectation = negate ? :should : :should_not
   #style ? style.send(expectation, have_text(regex)) : negate.nil?
 
@@ -133,7 +129,7 @@ def find_record_for(object, schema, name)
 end
 
 Then(/^the "([^"]*)" should be "([^"]*)"$/) do |id, css_class|
-    page.should have_css("##{id}.#{css_class}")
+  page.should have_css("##{id}.#{css_class}")
 end
 
 When(/^I click link with id "([^"]*)"$/) do |id|
@@ -153,4 +149,4 @@ def find_record_for(object, schema, name)
   within('.nav.nav-pills.pull-right') do |buttons|
     page.send(expectation_method, have_css('li.active > a', :text => "#{button_text}"))
   end
-end
+end
\ No newline at end of file

From a1346fbcf72a55fb2966a988af0c6b0d20dd9071 Mon Sep 17 00:00:00 2001
From: johnnymo87 <johnnymo87@gmail.com>
Date: Wed, 7 May 2014 14:29:26 +0100
Subject: [PATCH 13/14] resolved differences with editable footer links

---
 .../admin/admin_edit_static_page_links.feature  |  6 +++---
 features/step_definitions/category_steps.rb     | 17 -----------------
 features/step_definitions/factory_steps.rb      |  8 ++++++--
 features/step_definitions/static_pages_steps.rb | 14 --------------
 4 files changed, 9 insertions(+), 36 deletions(-)
 delete mode 100644 features/step_definitions/category_steps.rb

diff --git a/features/admin/admin_edit_static_page_links.feature b/features/admin/admin_edit_static_page_links.feature
index 7c30d9eeb..4e944d294 100644
--- 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/step_definitions/category_steps.rb b/features/step_definitions/category_steps.rb
deleted file mode 100644
index 23dc70c6d..000000000
--- a/features/step_definitions/category_steps.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-Given /the following categories exist/ do |categories_table|
-  categories_table.hashes.each do |cat|
-    Category.create! cat
-  end
-end
-
-Given /^the following categories_organizations exist:$/ do |join_table|
-  join_table.hashes.each do |row|
-    cat = Category.find_by_name row[:category]
-    org = Organization.find_by_name row[:organization]
-    org.categories << cat
-  end
-end
-
-And /^I select the "(.*?)" category$/ do |category|
-  select(category, :from => "category[id]")
-end
diff --git a/features/step_definitions/factory_steps.rb b/features/step_definitions/factory_steps.rb
index 5f9d3a20f..56f83caba 100644
--- a/features/step_definitions/factory_steps.rb
+++ b/features/step_definitions/factory_steps.rb
@@ -48,8 +48,12 @@ def stub_request_with_address(address, body = nil)
   end
 end
 
-When(/^a static page named "(.*?)" with permalink "(.*?)" and markdown content:$/) do |name, permalink, content|
-  Page.create!({:name => name, :permalink => permalink, :content => content})
+When(/^a static page named "(.*?)" with permalink "(.*?)" and markdown content:$/) \
+do |name, permalink, content|
+  Page.create!(:name => name,
+               :permalink => permalink,
+               :content => content,
+               :link_visible => true)
 end
 
 And(/^a file exists:$/) do |table|
diff --git a/features/step_definitions/static_pages_steps.rb b/features/step_definitions/static_pages_steps.rb
index 0eb3ed3a7..f17cdd321 100644
--- a/features/step_definitions/static_pages_steps.rb
+++ b/features/step_definitions/static_pages_steps.rb
@@ -1,17 +1,3 @@
-Given /^the following pages exist:$/ do |pages_table|
-  pages_table.hashes.each do |page|
-    Page.create! page
-  end
-end
-
-When(/^a static page named "(.*?)" with permalink "(.*?)" and markdown content:$/) \
-do |name, permalink, content|
-  Page.create!(:name => name,
-               :permalink => permalink,
-               :content => content,
-               :link_visible => true)
-end
-
 Then(/^I should be on the edit page for "(.*?)"$/) do |permalink|
   pg = Page.find_by_permalink(permalink)
   current_path.should eq( edit_page_path (pg.permalink ))

From d1205ca48382fa5a8fb79f345fe127f428beac65 Mon Sep 17 00:00:00 2001
From: Sam Joseph <tansaku@gmail.com>
Date: Tue, 17 Jun 2014 15:58:27 +0000
Subject: [PATCH 14/14] wrapping up final changes to nav pull request

---
 .../local_resident_seeking_support.feature    |  4 -
 features/home_page/map.feature                |  8 ++
 features/step_definitions/basic_steps.rb      | 24 -----
 features/step_definitions/email_steps.rb      |  7 --
 features/step_definitions/map_steps.rb        | 91 +++++++++++++++++++
 5 files changed, 99 insertions(+), 35 deletions(-)
 create mode 100644 features/step_definitions/map_steps.rb

diff --git a/features/home_page/local_resident_seeking_support.feature b/features/home_page/local_resident_seeking_support.feature
index 07d6846be..486cc2220 100644
--- a/features/home_page/local_resident_seeking_support.feature
+++ b/features/home_page/local_resident_seeking_support.feature
@@ -49,7 +49,3 @@ Feature: Local Resident seeking Support
       | Indian Elders Association      | Care for the elderly           |
       | Age UK                         | Care for the Elderly           |
 
-  Scenario: Volunteer index page has two column layout
-    Given I visit the home page
-    And cookies are approved
-    Then I should see a two column layout
diff --git a/features/home_page/map.feature b/features/home_page/map.feature
index a8cc3d8f9..90c889ea8 100644
--- a/features/home_page/map.feature
+++ b/features/home_page/map.feature
@@ -15,6 +15,14 @@ Background:
    Given the following users are registered:
   | email             | password | organization | confirmed_at |
   | registered_user-3@example.com | pppppppp | Youth UK  | 2007-01-01  10:00:00 |
+@show
+Scenario: Show all charities on homepage map
+  Given I visit the home page
+  And I should see "Indian Elders Association", "Age UK" and "Harrow Bereavement Counselling" in the map centered on local organizations
+
+Scenario: Clickable hyperlinks to charity homepage in map
+  Given I visit the home page
+  And I should see hyperlinks for "Indian Elders Association", "Age UK" and "Harrow Bereavement Counselling" in the map
 
 Scenario: Changing address on the map changes the map coordinates
     Given I visit the home page
diff --git a/features/step_definitions/basic_steps.rb b/features/step_definitions/basic_steps.rb
index 16f0b5ebd..f18e6b4d9 100644
--- a/features/step_definitions/basic_steps.rb
+++ b/features/step_definitions/basic_steps.rb
@@ -355,30 +355,6 @@
   end
 end
 
-And(/^"(.*?)" should not have nil coordinates$/) do |name|
-  org = Organization.find_by_name(name)
-  org.latitude.should_not be_nil
-  org.longitude.should_not be_nil
-end
-
-Then /^the coordinates for "(.*?)" and "(.*?)" should( not)? be the same/ do | org1_name, org2_name, negation|
-  #Gmaps.map.markers = [{"description":"<a href=\"/organizations/1320\">test</a>","lat":50.3739788,"lng":-95.84172219999999}];
-
-  matches = page.html.match %Q<{\\"description\\":\\"[^}]*#{org1_name}[^}]*\\",\\"lat\\":((?:-|)\\d+\.\\d+),\\"lng\\":((?:-|)\\d+\.\\d+)}>
-  org1_lat = matches[1]
-  org1_lng = matches[2]
-  matches = page.html.match %Q<{\\"description\\":\\"[^}]*#{org2_name}[^}]*\\",\\"lat\\":((?:-|)\\d+\.\\d+),\\"lng\\":((?:-|)\\d+\.\\d+)}>
-  org2_lat = matches[1]
-  org2_lng = matches[2]
-  lat_same = org1_lat == org2_lat
-  lng_same = org1_lng == org2_lng
-  if negation
-    expect(lat_same && lng_same).to be_false
-  else
-    expect(lat_same && lng_same).to be_true
-  end
-end
-
 Then(/^I should see "([^"]*)" page before "([^"]*)"$/) do |first_item, second_item|
   page.body.should =~ /#{first_item}.*#{second_item}/m
 end
diff --git a/features/step_definitions/email_steps.rb b/features/step_definitions/email_steps.rb
index 8a72babee..aa44ce645 100644
--- a/features/step_definitions/email_steps.rb
+++ b/features/step_definitions/email_steps.rb
@@ -31,11 +31,4 @@
   @rake['db:import:emails'].invoke(file)
 end
 
-Given /Google is indisposed for "(.*)"/ do |address|
-  body = %Q({
-"results" : [],
-"status" : "OVER_QUERY_LIMIT"
-})
-  stub_request_with_address(address, body)
-end
 
diff --git a/features/step_definitions/map_steps.rb b/features/step_definitions/map_steps.rb
new file mode 100644
index 000000000..7ae5487d5
--- /dev/null
+++ b/features/step_definitions/map_steps.rb
@@ -0,0 +1,91 @@
+Then /^I should see hyperlinks for "(.*?)", "(.*?)" and "(.*?)" in the map$/ do |org1, org2, org3|
+  org1 = Organization.find_by_name(org1)
+  org2 = Organization.find_by_name(org2)
+  org3 = Organization.find_by_name(org3)
+  [org1,org2,org3].each do |org|
+    match = page.html.match %Q<{\\"description\\":\\".*>#{org.name}</a>.*\\",\\"lat\\":((?:-|)\\d+\.\\d+),\\"lng\\":((?:-|)\\d+\.\\d+)}>
+    expect(match).not_to be_nil
+    # the following might work if we were actually running all the gmaps js
+    #expect(page).to have_xpath("//div[@class='map_container']//a[@href='#{organization_path(org)}']")
+  end
+end
+
+# could we move maps stuff into separate step file and couldn't these things be DRYer ...
+# e.g. one step to handle 2 or more orgs ...
+Then /^I should see "([^"]*?)", "([^"]*?)" and "([^"]*?)" in the map centered on local organizations$/ do |name1, name2, name3|
+  check_map([name1,name2,name3])
+  page.should have_xpath "//script[contains(.,'Gmaps.map.map_options.auto_adjust = false')]"
+  page.should have_xpath "//script[contains(.,'Gmaps.map.map_options.auto_zoom = true')]"
+  page.should have_xpath "//script[contains(.,'Gmaps.map.map_options.center_latitude = 51.5978')]"
+  page.should have_xpath "//script[contains(.,'Gmaps.map.map_options.center_longitude = -0.337')]"
+  page.should have_xpath "//script[contains(.,'Gmaps.map.map_options.zoom = 12')]"
+  page.should have_xpath "//script[contains(.,'Gmaps.map.map_options.auto_adjust = false')]"
+end
+
+Then /^I should see "([^"]*?)" and "([^"]*?)" in the map$/ do |name1, name2|
+  check_map([name1,name2])
+end
+
+
+def check_map(names)
+  # this is specific to checking for all items when we want a generic one
+  #page.should have_xpath "//script[contains(.,'Gmaps.map.markers = #{Organization.all.to_gmaps4rails}')]"
+
+  names.each do |name|
+    page.should have_xpath "//script[contains(.,'#{name}')]"
+    #org = Organization.find_by_name(name)
+    Organization.all.to_gmaps4rails.should match(name)
+  end
+end
+
+
+Then /^I should see search results for "(.*?)" in the map$/ do |search_terms|
+  orgs = Organization.search_by_keyword(search_terms)
+  orgs.each do |org|
+    matches = page.html.match %Q<{\\"description\\":\\".*>#{org.name}</a>.*\\",\\"lat\\":((?:-|)\\d+\.\\d+),\\"lng\\":((?:-|)\\d+\.\\d+)}>
+    expect(matches).not_to be_nil
+  end
+end
+
+def stub_request_with_address(address, body = nil)
+  filename = "#{address.gsub(/\s/, '_')}.json"
+  filename = File.read "test/fixtures/#{filename}"
+  # Webmock shows URLs with '%20' standing for space, but uri_encode susbtitutes with '+'
+  # So let's fix
+  addr_in_uri = address.uri_encode.gsub(/\+/, "%20")
+  # Stub request, which URL matches Regex
+  stub_request(:get, /http:\/\/maps.googleapis.com\/maps\/api\/geocode\/json\?address=#{addr_in_uri}/).
+      to_return(status => 200, :body => body || filename, :headers => {})
+end
+
+Given /Google is indisposed for "(.*)"/ do  |address|
+  body = %Q({
+"results" : [],
+"status" : "OVER_QUERY_LIMIT"
+})
+  stub_request_with_address(address, body)
+end
+
+And(/^"(.*?)" should not have nil coordinates$/) do |name|
+  org = Organization.find_by_name(name)
+  org.latitude.should_not be_nil
+  org.longitude.should_not be_nil
+end
+
+Then /^the coordinates for "(.*?)" and "(.*?)" should( not)? be the same/ do | org1_name, org2_name, negation|
+  #Gmaps.map.markers = [{"description":"<a href=\"/organizations/1320\">test</a>","lat":50.3739788,"lng":-95.84172219999999}];
+
+  matches = page.html.match %Q<{\\"description\\":\\"[^}]*#{org1_name}[^}]*\\",\\"lat\\":((?:-|)\\d+\.\\d+),\\"lng\\":((?:-|)\\d+\.\\d+)}>
+  org1_lat = matches[1]
+  org1_lng = matches[2]
+  matches = page.html.match %Q<{\\"description\\":\\"[^}]*#{org2_name}[^}]*\\",\\"lat\\":((?:-|)\\d+\.\\d+),\\"lng\\":((?:-|)\\d+\.\\d+)}>
+  org2_lat = matches[1]
+  org2_lng = matches[2]
+  lat_same = org1_lat == org2_lat
+  lng_same = org1_lng == org2_lng
+  if negation
+    expect(lat_same && lng_same).to be_false
+  else
+    expect(lat_same && lng_same).to be_true
+  end
+end