Updating for Rails 3 and Rspec 2

sarahmei · Oct 4, 2010 · 1fbd227 · 1fbd227
1 parent d0a6ec6
commit 1fbd227
Show file tree

Hide file tree

Showing 9 changed files with 174 additions and 212 deletions.
diff --git a/topics.feature → 1_topics.feature b/topics.feature → 1_topics.feature
@@ -3,17 +3,17 @@ Feature: Topics
   people need to be able to create and edit them
 
   Scenario: Getting to the new topic page
-    When I go to topics
-    And I follow "New topic"
+    When I go to the topics page
+    And I follow "New Topic"
     Then I should see a "Create" button
 
   Scenario: Creating a topic
-    Given I go to topics
-    And I follow "New topic"
+    Given I go to the topics page
+    And I follow "New Topic"
     When I fill in "Title" with "Rails Fixtures"
     And I fill in "Description" with "Introduce how to add test data with fixtures."
     And I press "Create"
     Then I should see "Rails Fixtures"
-    And I should be on topics 
+    And I should be on the topics page
 
 
diff --git a/topics_list_and_details.feature → 2_topics_list_and_details.feature b/topics_list_and_details.feature → 2_topics_list_and_details.feature
@@ -4,19 +4,21 @@ Feature: Topics List and Details
   and see details about them
 
   Background: Make sure we have a topic in the list
-    Given I go to topics
-    And I follow "New topic"
+    Given I go to the topics page
+    And I follow "New Topic"
     When I fill in "Title" with "Rails Fixtures"
     And I fill in "Description" with "Introduce how to add test data with fixtures."
     And I press "Create"
 
-  Scenario: Clicking on the topic title
-    When I follow "Rails Fixtures"
+  Scenario: Viewing a topic detail page
+    When I go to the topics page
+    And I follow "Rails Fixtures"
     Then I should see "Introduce how to add test data with fixtures."
-    And I should not see "add a topic"
+    And I should not see "New Topic"
 
   Scenario: Deleting a topic
+    When I go to the topics page
     When I follow "Delete"
     Then I should not see "Rails Fixtures"
-    And I should see "New topic"
+    And I should see "New Topic"
 
diff --git a/votes.feature → 3_votes.feature b/votes.feature → 3_votes.feature
@@ -3,16 +3,17 @@ Feature: Votes
   people need to be able to vote for the ones they like
 
   Background: Make sure that we have a topic
-    Given I go to topics
-    And I follow "New topic"
-    When I fill in "Title" with "Rails Fixtures"
+    Given I go to the topics page
+    And I follow "New Topic"
+    And I fill in "Title" with "Rails Fixtures"
     And I fill in "Description" with "Introduce how to add test data with fixtures."
     And I press "Create"
 
   Scenario: viewing votes already cast
-    When I go to topics
+    When I go to the topics page
     Then I should see "0 votes"
 
   Scenario: voting on a topic
-    When I follow "+1"
+    When I go to the topics page
+    And I follow "+1"
     Then I should see "1 vote"
diff --git a/authenticated_votes.feature → 4_authenticated_votes.feature b/authenticated_votes.feature → 4_authenticated_votes.feature
@@ -4,8 +4,8 @@ Feature: Votes with authentication
   and since we know who they are, they can take back their vote!
 
   Background: Make sure that we have a topic
-    Given I go to topics
-    And I follow "New topic"
+    Given I go to the topics page
+    And I follow "New Topic"
     When I fill in "Title" with "Rails Fixtures"
     And I fill in "Description" with "Introduce how to add test data with fixtures."
     And I press "Create"

diff --git a/step_definitions/new_webrat_steps.rb b/step_definitions/new_webrat_steps.rb
diff --git a/step_definitions/topic_steps.rb b/step_definitions/topic_steps.rb
@@ -0,0 +1,3 @@
+Then /^I should see a "([^\"]*)" button$/ do |button_name|
+  find_button(button_name)
+end