Features use new expect() syntax

Author: alindeman

features/controller_specs/anonymous_controller.feature

@@ -46,7 +46,7 @@ Feature: anonymous controller
         describe "handling AccessDenied exceptions" do
           it "redirects to the /401.html page" do
             get :index
-            response.should redirect_to("/401.html")
+            expect(response).to redirect_to("/401.html")
           end
         end
       end
@@ -84,7 +84,7 @@ Feature: anonymous controller
         describe "handling AccessDenied exceptions" do
           it "redirects to the /401.html page" do
             get :index
-            response.should redirect_to("/401.html")
+            expect(response).to redirect_to("/401.html")
           end
         end
       end
@@ -113,7 +113,7 @@ Feature: anonymous controller
         end
 
         it "creates an anonymous controller derived from ApplicationControllerSubclass" do
-          controller.should be_a_kind_of(ApplicationControllerSubclass)
+          expect(controller).to be_a_kind_of(ApplicationControllerSubclass)
         end
       end
       """
@@ -144,7 +144,7 @@ Feature: anonymous controller
         it "invokes the callback" do
           get :index
 
-          assigns[:callback_invoked].should be_true
+          expect(assigns[:callback_invoked]).to be_true
         end
       end
       """
@@ -194,59 +194,59 @@ Feature: anonymous controller
       describe "#index" do
         it "responds to GET" do
           get :index
-          response.body.should == "index called"
+          expect(response.body).to eq "index called"
         end
 
         it "also responds to POST" do
           post :index
-          response.body.should == "index called"
+          expect(response.body).to eq "index called"
         end
 
         it "also responds to PUT" do
           put :index
-          response.body.should == "index called"
+          expect(response.body).to eq "index called"
         end
 
         it "also responds to DELETE" do
           delete :index
-          response.body.should == "index called"
+          expect(response.body).to eq "index called"
         end
       end
 
       describe "#create" do
         it "responds to POST" do
           post :create
-          response.body.should == "create called"
+          expect(response.body).to eq "create called"
         end
 
         # And the rest...
         %w{get post put delete}.each do |calltype|
           it "responds to #{calltype}" do
             send(calltype, :create)
-            response.body.should == "create called"
+            expect(response.body).to eq "create called"
           end
         end
       end
 
       describe "#new" do
         it "responds to GET" do
           get :new
-          response.body.should == "new called"
+          expect(response.body).to eq "new called"
         end
 
         # And the rest...
         %w{get post put delete}.each do |calltype|
           it "responds to #{calltype}" do
             send(calltype, :new)
-            response.body.should == "new called"
+            expect(response.body).to eq "new called"
           end
         end
       end
 
       describe "#edit" do
         it "responds to GET" do
           get :edit, :id => "anyid"
-          response.body.should == "edit called"
+          expect(response.body).to eq "edit called"
         end
 
         it "requires the :id parameter" do
@@ -257,15 +257,15 @@ Feature: anonymous controller
         %w{get post put delete}.each do |calltype|
           it "responds to #{calltype}" do
             send(calltype, :edit, {:id => "anyid"})
-            response.body.should == "edit called"
+            expect(response.body).to eq "edit called"
           end
         end
       end
 
       describe "#show" do
         it "responds to GET" do
           get :show, :id => "anyid"
-          response.body.should == "show called"
+          expect(response.body).to eq "show called"
         end
 
         it "requires the :id parameter" do
@@ -276,15 +276,15 @@ Feature: anonymous controller
         %w{get post put delete}.each do |calltype|
           it "responds to #{calltype}" do
             send(calltype, :show, {:id => "anyid"})
-            response.body.should == "show called"
+            expect(response.body).to eq "show called"
           end
         end
       end
 
       describe "#update" do
         it "responds to PUT" do
           put :update, :id => "anyid"
-          response.body.should == "update called"
+          expect(response.body).to eq "update called"
         end
 
         it "requires the :id parameter" do
@@ -295,15 +295,15 @@ Feature: anonymous controller
         %w{get post put delete}.each do |calltype|
           it "responds to #{calltype}" do
             send(calltype, :update, {:id => "anyid"})
-            response.body.should == "update called"
+            expect(response.body).to eq "update called"
           end
         end
       end
 
       describe "#destroy" do
         it "responds to DELETE" do
           delete :destroy, :id => "anyid"
-          response.body.should == "destroy called"
+          expect(response.body).to eq "destroy called"
         end
 
         it "requires the :id parameter" do
@@ -314,7 +314,7 @@ Feature: anonymous controller
         %w{get post put delete}.each do |calltype|
           it "responds to #{calltype}" do
             send(calltype, :destroy, {:id => "anyid"})
-            response.body.should == "destroy called"
+            expect(response.body).to eq "destroy called"
           end
         end
       end

features/controller_specs/bypass_rescue.feature

@@ -40,7 +40,7 @@ Feature: bypass rescue
         describe "index" do
           it "redirects to the /401.html page" do
             get :index
-            response.should redirect_to("/401.html")
+            expect(response).to redirect_to("/401.html")
           end
         end
       end

features/controller_specs/controller_spec.feature

@@ -9,7 +9,7 @@ Feature: controller spec
         describe "GET index" do
           it "has a 200 status code" do
             get :index
-            response.code.should eq("200")
+            expect(response.code).to eq("200")
           end
         end
       end
@@ -22,7 +22,7 @@ Feature: controller spec
       """
       require "spec_helper"
 
-      RSpec.configure {|c| c.before { controller.should_not be_nil }}
+      RSpec.configure {|c| c.before { expect(controller).not_to be_nil }}
 
       describe WidgetsController do
         describe "GET index" do

features/controller_specs/isolation_from_views.feature

@@ -16,13 +16,13 @@ Feature: views are stubbed by default
         describe "index" do
           it "renders the index template" do
             get :index
-            response.should render_template("index")
-            response.body.should eq ""
+            expect(response).to render_template("index")
+            expect(response.body).to eq ""
           end
           it "renders the widgets/index template" do
             get :index
-            response.should render_template("widgets/index")
-            response.body.should eq ""
+            expect(response).to render_template("widgets/index")
+            expect(response.body).to eq ""
           end
         end
       end
@@ -39,7 +39,7 @@ Feature: views are stubbed by default
         describe "index" do
           it "renders the 'new' template" do
             get :index
-            response.should render_template("new")
+            expect(response).to render_template("new")
           end
         end
       end
@@ -58,8 +58,8 @@ Feature: views are stubbed by default
             controller.prepend_view_path 'app/views'
             controller.append_view_path 'app/views'
             get :custom_action
-            response.should render_template("custom_action")
-            response.body.should eq ""
+            expect(response).to render_template("custom_action")
+            expect(response.body).to eq ""
           end
         end
       end
@@ -78,8 +78,8 @@ Feature: views are stubbed by default
         it "renders the real custom_action template" do
           controller.prepend_view_path 'app/views'
           get :custom_action
-          response.should render_template("custom_action")
-          response.body.should match(/template for a custom action/)
+          expect(response).to render_template("custom_action")
+          expect(response.body).to match(/template for a custom action/)
         end
       end
       """

features/controller_specs/render_views.feature

@@ -14,7 +14,7 @@ Feature: render_views
         describe "GET index" do
           it "says 'Listing widgets'" do
             get :index
-            response.body.should =~ /Listing widgets/m
+            expect(response.body).to match /Listing widgets/m
           end
         end
       end
@@ -34,7 +34,7 @@ Feature: render_views
           describe "GET index" do
             it "renders the actual template" do
               get :index
-              response.body.should =~ /Listing widgets/m
+              expect(response.body).to match /Listing widgets/m
             end
           end
 
@@ -44,7 +44,7 @@ Feature: render_views
             describe "GET index" do
               it "renders the RSpec generated template" do
                 get :index
-                response.body.should eq("")
+                expect(response.body).to eq("")
               end
             end
           end
@@ -54,7 +54,7 @@ Feature: render_views
           describe "GET index" do
             it "renders the RSpec generated template" do
               get :index
-              response.body.should eq("")
+              expect(response.body).to eq("")
             end
           end
         end
@@ -65,7 +65,7 @@ Feature: render_views
           describe "GET index" do
             it "renders the actual template" do
               get :index
-              response.body.should =~ /Listing widgets/m
+              expect(response.body).to match /Listing widgets/m
             end
           end
         end
@@ -104,7 +104,7 @@ Feature: render_views
         describe "GET index" do
           it "renders the index template" do
             get :index
-            response.body.should =~ /Listing widgets/m
+            expect(response.body).to match /Listing widgets/m
           end
         end
       end

features/helper_specs/helper_spec.feature

@@ -21,7 +21,7 @@ Feature: helper spec
       describe ApplicationHelper do
         describe "#page_title" do
           it "returns the default title" do
-            helper.page_title.should eq("RSpec is your friend")
+            expect(helper.page_title).to eq("RSpec is your friend")
           end
         end
       end
@@ -46,7 +46,7 @@ Feature: helper spec
         describe "#page_title" do
           it "returns the instance variable" do
             assign(:title, "My Title")
-            helper.page_title.should eql("My Title")
+            expect(helper.page_title).to eql("My Title")
           end
         end
       end
@@ -71,7 +71,7 @@ Feature: helper spec
         describe "#widget_title" do
           it "includes the app name" do
             assign(:title, "This Widget")
-            helper.widget_title.should eq("The App: This Widget")
+            expect(helper.widget_title).to eq("The App: This Widget")
           end
         end
       end

features/mailer_specs/url_helpers.feature

@@ -11,7 +11,7 @@ Feature: URL helpers in mailer examples
 
       describe Notifications do
         it 'should have access to URL helpers' do
-          lambda { gadgets_url }.should_not raise_error
+          expect { gadgets_url }.not_to raise_error
         end
       end
       """
@@ -29,8 +29,8 @@ Feature: URL helpers in mailer examples
 
       describe Notifications do
         it 'should have access to URL helpers' do
-          lambda { gadgets_url :host => 'example.com' }.should_not raise_error
-          lambda { gadgets_url }.should raise_error
+          expect { gadgets_url :host => 'example.com' }.not_to raise_error
+          expect { gadgets_url }.to raise_error
         end
       end
       """

features/matchers/new_record_matcher.feature

@@ -13,14 +13,27 @@ Feature: be_a_new matcher
 
       describe Widget do
         context "when initialized" do
-          subject { Widget.new }
-          it { should be_a_new(Widget) }
-          it { should_not be_a_new(String) }
+          subject(:widget) { Widget.new }
+
+          it "is a new widget" do
+            expect(widget).to be_a_new(Widget)
+          end
+
+          it "is not a new string" do
+            expect(widget).not_to be_a_new(String)
+          end
         end
+
         context "when saved" do
-          subject { Widget.create }
-          it { should_not be_a_new(Widget) }
-          it { should_not be_a_new(String) }
+          subject(:widget) { Widget.create }
+
+          it "is not a new widget" do
+            expect(widget).not_to be_a_new(Widget)
+          end
+
+          it "is not a new string" do
+            expect(widget).not_to be_a_new(String)
+          end
         end
       end
       """