Replace old spinach step definitions with step.

1 files changed, 25 insertions, 25 deletions

diff --git a/features/steps/shared/diff_note.rb b/features/steps/shared/diff_note.rb
index b107b083220..7d017669b7c 100644
--- a/features/steps/shared/diff_note.rb
+++ b/features/steps/shared/diff_note.rb
@@ -2,24 +2,24 @@ module SharedDiffNote
   include Spinach::DSL
   include RepoHelpers
 
-  Given 'I cancel the diff comment' do
+  step 'I cancel the diff comment' do
     within(diff_file_selector) do
       find(".js-close-discussion-note-form").click
     end
   end
 
-  Given 'I delete a diff comment' do
+  step 'I delete a diff comment' do
     find('.note').hover
     find(".js-note-delete").click
   end
 
-  Given 'I haven\'t written any diff comment text' do
+  step 'I haven\'t written any diff comment text' do
     within(diff_file_selector) do
       fill_in "note[note]", with: ""
     end
   end
 
-  Given 'I leave a diff comment like "Typo, please fix"' do
+  step 'I leave a diff comment like "Typo, please fix"' do
     click_diff_line(sample_commit.line_code)
     within("#{diff_file_selector} form[rel$='#{sample_commit.line_code}']") do
       fill_in "note[note]", with: "Typo, please fix"
@@ -28,7 +28,7 @@ module SharedDiffNote
     end
   end
 
-  Given 'I preview a diff comment text like "Should fix it :smile:"' do
+  step 'I preview a diff comment text like "Should fix it :smile:"' do
     click_diff_line(sample_commit.line_code)
     within("#{diff_file_selector} form[rel$='#{sample_commit.line_code}']") do
       fill_in "note[note]", with: "Should fix it :smile:"
@@ -36,7 +36,7 @@ module SharedDiffNote
     end
   end
 
-  Given 'I preview another diff comment text like "DRY this up"' do
+  step 'I preview another diff comment text like "DRY this up"' do
     click_diff_line(sample_commit.del_line_code)
 
     within("#{diff_file_selector} form[rel$='#{sample_commit.del_line_code}']") do
@@ -45,109 +45,109 @@ module SharedDiffNote
     end
   end
 
-  Given 'I open a diff comment form' do
+  step 'I open a diff comment form' do
     click_diff_line(sample_commit.line_code)
   end
 
-  Given 'I open another diff comment form' do
+  step 'I open another diff comment form' do
     click_diff_line(sample_commit.del_line_code)
   end
 
-  Given 'I write a diff comment like ":-1: I don\'t like this"' do
+  step 'I write a diff comment like ":-1: I don\'t like this"' do
     within(diff_file_selector) do
       fill_in "note[note]", with: ":-1: I don\'t like this"
     end
   end
 
-  Given 'I submit the diff comment' do
+  step 'I submit the diff comment' do
     within(diff_file_selector) do
       click_button("Add Comment")
     end
   end
 
-  Then 'I should not see the diff comment form' do
+  step 'I should not see the diff comment form' do
     within(diff_file_selector) do
       page.should_not have_css("form.new_note")
     end
   end
 
-  Then 'I should not see the diff comment preview button' do
+  step 'I should not see the diff comment preview button' do
     within(diff_file_selector) do
       page.should have_css(".js-note-preview-button", visible: false)
     end
   end
 
-  Then 'I should not see the diff comment text field' do
+  step 'I should not see the diff comment text field' do
     within(diff_file_selector) do
       page.should have_css(".js-note-text", visible: false)
     end
   end
 
-  Then 'I should only see one diff form' do
+  step 'I should only see one diff form' do
     within(diff_file_selector) do
       page.should have_css("form.new_note", count: 1)
     end
   end
 
-  Then 'I should see a diff comment form with ":-1: I don\'t like this"' do
+  step 'I should see a diff comment form with ":-1: I don\'t like this"' do
     within(diff_file_selector) do
       page.should have_field("note[note]", with: ":-1: I don\'t like this")
     end
   end
 
-  Then 'I should see a diff comment saying "Typo, please fix"' do
+  step 'I should see a diff comment saying "Typo, please fix"' do
     within("#{diff_file_selector} .note") do
       page.should have_content("Typo, please fix")
     end
   end
 
-  Then 'I should see a discussion reply button' do
+  step 'I should see a discussion reply button' do
     within(diff_file_selector) do
       page.should have_link("Reply")
     end
   end
 
-  Then 'I should see a temporary diff comment form' do
+  step 'I should see a temporary diff comment form' do
     within(diff_file_selector) do
       page.should have_css(".js-temp-notes-holder form.new_note")
     end
   end
 
-  Then 'I should see add a diff comment button' do
+  step 'I should see add a diff comment button' do
     page.should have_css(".js-add-diff-note-button", visible: false)
   end
 
-  Then 'I should see an empty diff comment form' do
+  step 'I should see an empty diff comment form' do
     within(diff_file_selector) do
       page.should have_field("note[note]", with: "")
     end
   end
 
-  Then 'I should see the cancel comment button' do
+  step 'I should see the cancel comment button' do
     within("#{diff_file_selector} form") do
       page.should have_css(".js-close-discussion-note-form", text: "Cancel")
     end
   end
 
-  Then 'I should see the diff comment preview' do
+  step 'I should see the diff comment preview' do
     within("#{diff_file_selector} form") do
       page.should have_css(".js-note-preview", visible: false)
     end
   end
 
-  Then 'I should see the diff comment edit button' do
+  step 'I should see the diff comment edit button' do
     within(diff_file_selector) do
       page.should have_css(".js-note-write-button", visible: true)
     end
   end
 
-  Then 'I should see the diff comment preview button' do
+  step 'I should see the diff comment preview button' do
     within(diff_file_selector) do
       page.should have_css(".js-note-preview-button", visible: true)
     end
   end
 
-  Then 'I should see two separate previews' do
+  step 'I should see two separate previews' do
     within(diff_file_selector) do
       page.should have_css(".js-note-preview", visible: true, count: 2)
       page.should have_content("Should fix it")