Remove should from step definitions

Author: oestrich

features/step_definitions/curl_steps.rb

@@ -3,11 +3,11 @@
 
   within("pre.curl") do
     if condition
-      page.should have_content("Host")
-      page.should have_content("Cookie")
+      expect(page).to have_content("Host")
+      expect(page).to have_content("Cookie")
     else
-      page.should_not have_content("Host")
-      page.should_not have_content("Cookie")
+      expect(page).to_not have_content("Host")
+      expect(page).to_not have_content("Cookie")
     end
   end
 end

features/step_definitions/html_steps.rb

@@ -7,29 +7,29 @@
 end
 
 Then /^I should see the following resources:$/ do |table|
-  all("h2").map(&:text).should == table.raw.flatten
+  expect(all("h2").map(&:text)).to eq(table.raw.flatten)
 end
 
 Then /^I should see the following parameters:$/ do |table|
   names = all(".parameters .name").map(&:text)
   descriptions = all(".parameters .description").map(&:text)
 
-  names.zip(descriptions).should == table.rows
+  expect(names.zip(descriptions)).to eq(table.rows)
 end
 
 Then(/^I should see the following response fields:$/) do |table|
   names = all(".response-fields .name").map(&:text)
   descriptions = all(".response-fields .description").map(&:text)
 
-  names.zip(descriptions).should == table.rows
+  expect(names.zip(descriptions)).to eq(table.rows)
 end
 
 Then /^I should see the following (request|response) headers:$/ do |part, table|
   actual_headers = page.find("pre.#{part}.headers").text
   expected_headers = table.raw.map { |row| row.join(": ") }
 
   expected_headers.each do |row|
-    actual_headers.should include(row.strip)
+    expect(actual_headers).to include(row.strip)
   end
 end
 
@@ -38,38 +38,38 @@
   expected_headers = table.raw.map { |row| row.join(": ") }
 
   expected_headers.each do |row|
-    actual_headers.should_not include(row.strip)
+    expect(actual_headers).to_not include(row.strip)
   end
 end
 
 Then /^I should see the route is "([^"]*)"$/ do |route|
-  page.should have_css(".request.route", :text => route)
+  expect(page).to have_css(".request.route", :text => route)
 end
 
 Then /^I should see the following query parameters:$/ do |table|
   text = page.find("pre.request.query_parameters").text
   actual = text.split("\n")
   expected = table.raw.map { |row| row.join(": ") }
 
-  actual.should =~ expected
+  expect(actual).to match(expected)
 end
 
 Then /^I should see the response status is "([^"]*)"$/ do |status|
-  page.should have_css(".response.status", :text => status)
+  expect(page).to have_css(".response.status", :text => status)
 end
 
 Then /^I should see the following request body:$/ do |request_body|
-  page.should have_css("pre.request.body", :text => request_body)
+  expect(page).to have_css("pre.request.body", :text => request_body)
 end
 
 Then /^I should see the following response body:$/ do |response_body|
-  page.should have_css("pre.response.body", :text => response_body)
+  expect(page).to have_css("pre.response.body", :text => response_body)
 end
 
 Then /^I should see the api name "(.*?)"$/ do |name|
   title = find("title").text
   header = find("h1").text
 
-  title.should eq(name)
-  header.should eq(name)
+  expect(title).to eq(name)
+  expect(header).to eq(name)
 end

features/step_definitions/image_steps.rb

@@ -4,5 +4,5 @@
 
 Then /^the generated documentation should be encoded correctly$/ do
   file = File.read(File.join(current_dir, "doc", "api", "foobars", "uploading_a_file.html"))
-  file.should =~ /file\.png/
+  expect(file).to match(/file\.png/)
 end

features/step_definitions/json_steps.rb

@@ -1,6 +1,6 @@
 Then /^the file "(.*?)" should contain JSON exactly like:$/ do |file, exact_content|
   prep_for_fs_check do
     json = IO.read(file)
-    JSON.parse(json).should == JSON.parse(exact_content)
+    expect(JSON.parse(json)).to eq(JSON.parse(exact_content))
   end
 end