Replace old spinach step definitions with step.

3 files changed, 20 insertions, 20 deletions

diff --git a/features/steps/snippets/discover.rb b/features/steps/snippets/discover.rb
index 09337937002..307fcc668b2 100644
--- a/features/steps/snippets/discover.rb
+++ b/features/steps/snippets/discover.rb
@@ -3,11 +3,11 @@ class DiscoverSnippets < Spinach::FeatureSteps
   include SharedPaths
   include SharedSnippet
 
-  Then 'I should see "Personal snippet one" in snippets' do
+  step 'I should see "Personal snippet one" in snippets' do
     page.should have_content "Personal snippet one"
   end
 
-  And 'I should not see "Personal snippet private" in snippets' do
+  step 'I should not see "Personal snippet private" in snippets' do
     page.should_not have_content "Personal snippet private"
   end
 
diff --git a/features/steps/snippets/snippets.rb b/features/steps/snippets/snippets.rb
index 040b5390a5a..74e9c84dbaf 100644
--- a/features/steps/snippets/snippets.rb
+++ b/features/steps/snippets/snippets.rb
@@ -4,25 +4,25 @@ class SnippetsFeature < Spinach::FeatureSteps
   include SharedProject
   include SharedSnippet
 
-  Given 'I click link "Personal snippet one"' do
+  step 'I click link "Personal snippet one"' do
     click_link "Personal snippet one"
   end
 
-  And 'I should not see "Personal snippet one" in snippets' do
+  step 'I should not see "Personal snippet one" in snippets' do
     page.should_not have_content "Personal snippet one"
   end
 
-  And 'I click link "Edit"' do
+  step 'I click link "Edit"' do
     within ".file-title" do
       click_link "Edit"
     end
   end
 
-  And 'I click link "Destroy"' do
+  step 'I click link "Destroy"' do
     click_link "remove"
   end
 
-  And 'I submit new snippet "Personal snippet three"' do
+  step 'I submit new snippet "Personal snippet three"' do
     fill_in "personal_snippet_title", :with => "Personal snippet three"
     fill_in "personal_snippet_file_name", :with => "my_snippet.rb"
     within('.file-editor') do
@@ -31,30 +31,30 @@ class SnippetsFeature < Spinach::FeatureSteps
     click_button "Create snippet"
   end
 
-  Then 'I should see snippet "Personal snippet three"' do
+  step 'I should see snippet "Personal snippet three"' do
     page.should have_content "Personal snippet three"
     page.should have_content "Content of snippet three"
   end
 
-  And 'I submit new title "Personal snippet new title"' do
+  step 'I submit new title "Personal snippet new title"' do
     fill_in "personal_snippet_title", :with => "Personal snippet new title"
     click_button "Save"
   end
 
-  Then 'I should see "Personal snippet new title"' do
+  step 'I should see "Personal snippet new title"' do
     page.should have_content "Personal snippet new title"
   end
 
-  And 'I uncheck "Private" checkbox' do
+  step 'I uncheck "Private" checkbox' do
     choose "Public"
     click_button "Save"
   end
 
-  Then 'I should see "Personal snippet one" public' do
+  step 'I should see "Personal snippet one" public' do
     page.should have_no_xpath("//i[@class='public-snippet']")
   end
 
-  And 'I visit snippet page "Personal snippet one"' do
+  step 'I visit snippet page "Personal snippet one"' do
     visit snippet_path(snippet)
   end
 
diff --git a/features/steps/snippets/user.rb b/features/steps/snippets/user.rb
index 2d7ffc866e7..9b702b8c844 100644
--- a/features/steps/snippets/user.rb
+++ b/features/steps/snippets/user.rb
@@ -3,33 +3,33 @@ class UserSnippets < Spinach::FeatureSteps
   include SharedPaths
   include SharedSnippet
 
-  Given 'I visit my snippets page' do
+  step 'I visit my snippets page' do
     visit user_snippets_path(current_user)
   end
 
-  Then 'I should see "Personal snippet one" in snippets' do
+  step 'I should see "Personal snippet one" in snippets' do
     page.should have_content "Personal snippet one"
   end
 
-  And 'I should see "Personal snippet private" in snippets' do
+  step 'I should see "Personal snippet private" in snippets' do
     page.should have_content "Personal snippet private"
   end
 
-  Then 'I should not see "Personal snippet one" in snippets' do
+  step 'I should not see "Personal snippet one" in snippets' do
     page.should_not have_content "Personal snippet one"
   end
 
-  And 'I should not see "Personal snippet private" in snippets' do
+  step 'I should not see "Personal snippet private" in snippets' do
     page.should_not have_content "Personal snippet private"
   end
 
-  Given 'I click "Public" filter' do
+  step 'I click "Public" filter' do
     within('.nav-stacked') do
       click_link "Public"
     end
   end
 
-  Given 'I click "Private" filter' do
+  step 'I click "Private" filter' do
     within('.nav-stacked') do
       click_link "Private"
     end