rspec-rails 2.99.0.beta1 → 2.99.0.beta2

data/spec/rspec/rails/example/feature_example_group_spec.rb

@@ -2,8 +2,8 @@ require "spec_helper"
 
 module RSpec::Rails
   describe FeatureExampleGroup do
-    it { should be_included_in_files_in('./spec/features/') }
-    it { should be_included_in_files_in('.\\spec\\features\\') }
+    it { is_expected.to be_included_in_files_in('./spec/features/') }
+    it { is_expected.to be_included_in_files_in('.\\spec\\features\\') }
 
     it "adds :type => :feature to the metadata" do
       group = RSpec::Core::ExampleGroup.describe do

data/spec/rspec/rails/example/helper_example_group_spec.rb

@@ -5,32 +5,32 @@ module RSpec::Rails
     module ::FoosHelper; end
     subject { HelperExampleGroup }
 
-    it { should be_included_in_files_in('./spec/helpers/') }
-    it { should be_included_in_files_in('.\\spec\\helpers\\') }
+    it { is_expected.to be_included_in_files_in('./spec/helpers/') }
+    it { is_expected.to be_included_in_files_in('.\\spec\\helpers\\') }
 
     it "provides a controller_path based on the helper module's name" do
       example = double
       example.stub_chain(:example_group, :described_class) { FoosHelper }
 
       helper_spec = Object.new.extend HelperExampleGroup
-      helper_spec.__send__(:_controller_path, example).should == "foos"
+      expect(helper_spec.__send__(:_controller_path, example)).to eq("foos")
     end
 
     it "adds :type => :helper to the metadata" do
       group = RSpec::Core::ExampleGroup.describe do
         include HelperExampleGroup
       end
-      group.metadata[:type].should eq(:helper)
+      expect(group.metadata[:type]).to eq(:helper)
     end
 
     describe "#helper" do
       it "returns the instance of AV::Base provided by AV::TC::Behavior" do
         helper_spec = Object.new.extend HelperExampleGroup
-        helper_spec.should_receive(:view_assigns)
+        expect(helper_spec).to receive(:view_assigns)
         av_tc_b_view = double('_view')
-        av_tc_b_view.should_receive(:assign)
-        helper_spec.stub(:_view) { av_tc_b_view }
-        helper_spec.helper.should eq(av_tc_b_view)
+        expect(av_tc_b_view).to receive(:assign)
+        allow(helper_spec).to receive(:_view) { av_tc_b_view }
+        expect(helper_spec.helper).to eq(av_tc_b_view)
       end
 
       before do
@@ -48,7 +48,7 @@ module RSpec::Rails
             ActionView::Base.new
           end
         end
-        group.new.helper.should be_kind_of(ApplicationHelper)
+        expect(group.new.helper).to be_kind_of(ApplicationHelper)
       end
     end
   end
@@ -57,9 +57,9 @@ module RSpec::Rails
     describe "determine_default_helper_class" do
       it "returns the helper module passed to describe" do
         helper_spec = Object.new.extend HelperExampleGroup::ClassMethods
-        helper_spec.stub(:described_class) { FoosHelper }
-        helper_spec.determine_default_helper_class("ignore this").
-          should eq(FoosHelper)
+        allow(helper_spec).to receive(:described_class) { FoosHelper }
+        expect(helper_spec.determine_default_helper_class("ignore this")).
+          to eq(FoosHelper)
       end
     end
   end

data/spec/rspec/rails/example/mailer_example_group_spec.rb

@@ -8,14 +8,14 @@ module RSpec::Rails
       Rails.stub_chain(:configuration, :action_mailer, :default_url_options).and_return({})
     end
 
-    it { should be_included_in_files_in('./spec/mailers/') }
-    it { should be_included_in_files_in('.\\spec\\mailers\\') }
+    it { is_expected.to be_included_in_files_in('./spec/mailers/') }
+    it { is_expected.to be_included_in_files_in('.\\spec\\mailers\\') }
 
     it "adds :type => :mailer to the metadata" do
       group = RSpec::Core::ExampleGroup.describe do
         include MailerExampleGroup
       end
-      group.metadata[:type].should eq(:mailer)
+      expect(group.metadata[:type]).to eq(:mailer)
     end
   end
 end

data/spec/rspec/rails/example/model_example_group_spec.rb

@@ -2,14 +2,14 @@ require "spec_helper"
 
 module RSpec::Rails
   describe ModelExampleGroup do
-    it { should be_included_in_files_in('./spec/models/') }
-    it { should be_included_in_files_in('.\\spec\\models\\') }
+    it { is_expected.to be_included_in_files_in('./spec/models/') }
+    it { is_expected.to be_included_in_files_in('.\\spec\\models\\') }
 
     it "adds :type => :model to the metadata" do
       group = RSpec::Core::ExampleGroup.describe do
         include ModelExampleGroup
       end
-      group.metadata[:type].should eq(:model)
+      expect(group.metadata[:type]).to eq(:model)
     end
   end
 end

data/spec/rspec/rails/example/request_example_group_spec.rb

@@ -2,16 +2,16 @@ require "spec_helper"
 
 module RSpec::Rails
   describe RequestExampleGroup do
-    it { should be_included_in_files_in('./spec/requests/') }
-    it { should be_included_in_files_in('./spec/integration/') }
-    it { should be_included_in_files_in('.\\spec\\requests\\') }
-    it { should be_included_in_files_in('.\\spec\\integration\\') }
+    it { is_expected.to be_included_in_files_in('./spec/requests/') }
+    it { is_expected.to be_included_in_files_in('./spec/integration/') }
+    it { is_expected.to be_included_in_files_in('.\\spec\\requests\\') }
+    it { is_expected.to be_included_in_files_in('.\\spec\\integration\\') }
 
     it "adds :type => :request to the metadata" do
       group = RSpec::Core::ExampleGroup.describe do
         include RequestExampleGroup
       end
-      group.metadata[:type].should eq(:request)
+      expect(group.metadata[:type]).to eq(:request)
     end
   end
 end

data/spec/rspec/rails/example/routing_example_group_spec.rb

@@ -2,14 +2,14 @@ require "spec_helper"
 
 module RSpec::Rails
   describe RoutingExampleGroup do
-    it { should be_included_in_files_in('./spec/routing/') }
-    it { should be_included_in_files_in('.\\spec\\routing\\') }
+    it { is_expected.to be_included_in_files_in('./spec/routing/') }
+    it { is_expected.to be_included_in_files_in('.\\spec\\routing\\') }
 
     it "adds :type => :routing to the metadata" do
       group = RSpec::Core::ExampleGroup.describe do
         include RoutingExampleGroup
       end
-      group.metadata[:type].should eq(:routing)
+      expect(group.metadata[:type]).to eq(:routing)
     end
 
     describe "named routes" do
@@ -23,9 +23,9 @@ module RSpec::Rails
         # Yes, this is quite invasive
         url_helpers = double('url_helpers', :foo_path => "foo")
         routes = double('routes', :url_helpers => url_helpers)
-        example.stub(:routes => routes)
+        allow(example).to receive(:routes).and_return(routes)
 
-        example.foo_path.should == "foo"
+        expect(example.foo_path).to eq("foo")
       end
     end
   end

data/spec/rspec/rails/example/view_example_group_spec.rb

@@ -2,14 +2,14 @@ require "spec_helper"
 
 module RSpec::Rails
   describe ViewExampleGroup do
-    it { should be_included_in_files_in('./spec/views/') }
-    it { should be_included_in_files_in('.\\spec\\views\\') }
+    it { is_expected.to be_included_in_files_in('./spec/views/') }
+    it { is_expected.to be_included_in_files_in('.\\spec\\views\\') }
 
     it "adds :type => :view to the metadata" do
       group = RSpec::Core::ExampleGroup.describe do
         include ViewExampleGroup
       end
-      group.metadata[:type].should eq(:view)
+      expect(group.metadata[:type]).to eq(:view)
     end
 
     describe 'automatic inclusion of helpers' do
@@ -18,7 +18,7 @@ module RSpec::Rails
 
       it 'includes the helper with the same name' do
         group = RSpec::Core::ExampleGroup.describe 'things/show.html.erb'
-        group.should_receive(:helper).with(ThingsHelper)
+        expect(group).to receive(:helper).with(ThingsHelper)
         group.class_eval do
           include ViewExampleGroup
         end
@@ -26,7 +26,7 @@ module RSpec::Rails
 
       it 'includes the namespaced helper with the same name' do
         group = RSpec::Core::ExampleGroup.describe 'namespaced/things/show.html.erb'
-        group.should_receive(:helper).with(Namespaced::ThingsHelper)
+        expect(group).to receive(:helper).with(Namespaced::ThingsHelper)
         group.class_eval do
           include ViewExampleGroup
         end
@@ -34,11 +34,11 @@ module RSpec::Rails
 
       it 'operates normally when no helper with the same name exists' do
         raise 'unexpected constant found' if Object.const_defined?('ClocksHelper')
-        lambda {
+        expect {
           RSpec::Core::ExampleGroup.describe 'clocks/show.html.erb' do
             include ViewExampleGroup
           end
-        }.should_not raise_error
+        }.not_to raise_error
       end
 
       context 'application helper exists' do
@@ -57,7 +57,7 @@ module RSpec::Rails
 
         it 'includes the application helper' do
           group = RSpec::Core::Example.describe 'bars/new.html.erb'
-          group.should_receive(:helper).with(ApplicationHelper)
+          expect(group).to receive(:helper).with(ApplicationHelper)
           group.class_eval do
             include ViewExampleGroup
           end
@@ -79,11 +79,11 @@ module RSpec::Rails
         end
 
         it 'operates normally' do
-          lambda {
+          expect {
             RSpec::Core::ExampleGroup.describe 'foos/edit.html.erb' do
               include ViewExampleGroup
             end
-          }.should_not raise_error
+          }.not_to raise_error
         end
       end
     end
@@ -109,19 +109,19 @@ module RSpec::Rails
 
       context "given no input" do
         it "sends render(:template => (described file)) to the view" do
-          view_spec.stub(:_default_file_to_render) { "widgets/new" }
+          allow(view_spec).to receive(:_default_file_to_render) { "widgets/new" }
           view_spec.render
-          view_spec.received.first.should == [{:template => "widgets/new"},{}, nil]
+          expect(view_spec.received.first).to eq([{:template => "widgets/new"},{}, nil])
         end
 
         it "converts the filename components into render options" do
-          view_spec.stub(:_default_file_to_render) { "widgets/new.en.html.erb" }
+          allow(view_spec).to receive(:_default_file_to_render) { "widgets/new.en.html.erb" }
           view_spec.render
 
           if ::Rails::VERSION::STRING >= '3.2'
-            view_spec.received.first.should == [{:template => "widgets/new", :locales=>['en'], :formats=>['html'], :handlers=>['erb']}, {}, nil]
+            expect(view_spec.received.first).to eq([{:template => "widgets/new", :locales=>['en'], :formats=>['html'], :handlers=>['erb']}, {}, nil])
           else
-            view_spec.received.first.should == [{:template => "widgets/new.en.html.erb"}, {}, nil]
+            expect(view_spec.received.first).to eq([{:template => "widgets/new.en.html.erb"}, {}, nil])
           end
         end
       end
@@ -129,14 +129,14 @@ module RSpec::Rails
       context "given a string" do
         it "sends string as the first arg to render" do
           view_spec.render('arbitrary/path')
-          view_spec.received.first.should == ["arbitrary/path", {}, nil]
+          expect(view_spec.received.first).to eq(["arbitrary/path", {}, nil])
         end
       end
 
       context "given a hash" do
         it "sends the hash as the first arg to render" do
           view_spec.render(:foo => 'bar')
-          view_spec.received.first.should == [{:foo => "bar"}, {}, nil]
+          expect(view_spec.received.first).to eq([{:foo => "bar"}, {}, nil])
         end
       end
     end
@@ -152,7 +152,7 @@ module RSpec::Rails
       end
 
       it 'delegates to the controller' do
-        view_spec.controller.should_receive(:params).and_return({})
+        expect(view_spec.controller).to receive(:params).and_return({})
         view_spec.params[:foo] = 1
       end
     end
@@ -165,19 +165,19 @@ module RSpec::Rails
       end
       context "with a common _default_file_to_render" do
         it "it returns the directory" do
-          view_spec.stub(:_default_file_to_render).
+          allow(view_spec).to receive(:_default_file_to_render).
             and_return("things/new.html.erb")
-          view_spec.__send__(:_controller_path).
-            should == "things"
+          expect(view_spec.__send__(:_controller_path)).
+            to eq("things")
         end
       end
 
       context "with a nested _default_file_to_render" do
         it "it returns the directory path" do
-          view_spec.stub(:_default_file_to_render).
+          allow(view_spec).to receive(:_default_file_to_render).
             and_return("admin/things/new.html.erb")
-          view_spec.__send__(:_controller_path).
-            should == "admin/things"
+          expect(view_spec.__send__(:_controller_path)).
+            to eq("admin/things")
         end
       end
     end
@@ -191,8 +191,23 @@ module RSpec::Rails
 
       it "delegates to _view" do
         view = double("view")
-        view_spec.stub(:_view) { view }
-        view_spec.view.should == view
+        allow(view_spec).to receive(:_view) { view }
+        expect(view_spec.view).to eq(view)
+      end
+
+      it 'is accessible to hooks' do
+        with_isolated_config do
+          run_count = 0
+          RSpec.configuration.before(:each, :type => :view) do
+            allow(view).to receive(:a_stubbed_helper) { :value }
+            run_count += 1
+          end
+          group = RSpec::Core::ExampleGroup.describe 'a view', :type => :view do
+            specify { true }
+          end
+          group.run NullObject.new
+          expect(run_count).to eq 1
+        end
       end
     end
 
@@ -204,15 +219,15 @@ module RSpec::Rails
         end.new
       end
 
-      before { RSpec.stub(:deprecate) }
+      before { allow(RSpec).to receive(:deprecate) }
 
       it "is deprecated" do
-        RSpec.should_receive(:deprecate)
+        expect(RSpec).to receive(:deprecate)
         view_spec.template
       end
 
       it "delegates to #view" do
-        view_spec.should_receive(:view)
+        expect(view_spec).to receive(:view)
         view_spec.template
       end
     end

data/spec/rspec/rails/extensions/active_model/errors_on_spec.rb

@@ -9,15 +9,15 @@ describe "errors_on" do
 
   it "calls valid?" do
     model = klass.new
-    model.should_receive(:valid?)
+    expect(model).to receive(:valid?)
     model.errors_on(:foo)
   end
 
   it "returns the errors on that attribute" do
     model = klass.new
-    model.stub(:errors) do
+    allow(model).to receive(:errors) do
       { :foo => ['a', 'b'] }
     end
-    model.errors_on(:foo).should eq(['a','b'])
+    expect(model.errors_on(:foo)).to eq(['a','b'])
   end
 end

data/spec/rspec/rails/fixture_support_spec.rb

@@ -4,13 +4,13 @@ module RSpec::Rails
   describe FixtureSupport do
     context "with use_transactional_fixtures set to false" do
       it "still supports fixture_path" do
-        RSpec.configuration.stub(:use_transactional_fixtures) { false }
+        allow(RSpec.configuration).to receive(:use_transactional_fixtures) { false }
         group = RSpec::Core::ExampleGroup.describe do
           include FixtureSupport
         end
 
-        group.should respond_to(:fixture_path)
-        group.should respond_to(:fixture_path=)
+        expect(group).to respond_to(:fixture_path)
+        expect(group).to respond_to(:fixture_path=)
       end
     end
   end

data/spec/rspec/rails/matchers/be_a_new_spec.rb

@@ -11,12 +11,12 @@ describe "be_a_new matcher" do
     end
     context "right class" do
       it "passes" do
-        record.should be_a_new(record.class)
+        expect(record).to be_a_new(record.class)
       end
     end
     context "wrong class" do
       it "fails" do
-        record.should_not be_a_new(String)
+        expect(record).not_to be_a_new(String)
       end
     end
   end
@@ -29,12 +29,12 @@ describe "be_a_new matcher" do
     end
     context "right class" do
       it "fails" do
-        record.should_not be_a_new(record.class)
+        expect(record).not_to be_a_new(record.class)
       end
     end
     context "wrong class" do
       it "fails" do
-        record.should_not be_a_new(String)
+        expect(record).not_to be_a_new(String)
       end
     end
   end
@@ -57,24 +57,24 @@ describe "be_a_new matcher" do
 
       context "all attributes same" do
         it "passes" do
-          record.should be_a_new(record.class).with(:foo => 'foo', :bar => 'bar')
+          expect(record).to be_a_new(record.class).with(:foo => 'foo', :bar => 'bar')
         end
       end
 
       context "one attribute same" do
         it "passes" do
-          record.should be_a_new(record.class).with(:foo => 'foo')
+          expect(record).to be_a_new(record.class).with(:foo => 'foo')
         end
       end
 
       context "no attributes same" do
         it "fails" do
           expect {
-            record.should be_a_new(record.class).with(:zoo => 'zoo', :car => 'car')
+            expect(record).to be_a_new(record.class).with(:zoo => 'zoo', :car => 'car')
           }.to raise_error {|e|
-            e.message.should match(/attributes {.*} were not set on #{record.inspect}/)
-            e.message.should match(/"zoo"=>"zoo"/)
-            e.message.should match(/"car"=>"car"/)
+            expect(e.message).to match(/attributes {.*} were not set on #{record.inspect}/)
+            expect(e.message).to match(/"zoo"=>"zoo"/)
+            expect(e.message).to match(/"car"=>"car"/)
           }
         end
       end
@@ -82,7 +82,7 @@ describe "be_a_new matcher" do
       context "one attribute value not the same" do
         it "fails" do
           expect {
-            record.should be_a_new(record.class).with(:foo => 'bar')
+            expect(record).to be_a_new(record.class).with(:foo => 'bar')
           }.to raise_error(
             %Q(attribute {"foo"=>"bar"} was not set on #{record.inspect})
           )
@@ -108,7 +108,7 @@ describe "be_a_new matcher" do
       context "all attributes same" do
         it "fails" do
           expect {
-            record.should be_a_new(String).with(:foo => 'foo', :bar => 'bar')
+            expect(record).to be_a_new(String).with(:foo => 'foo', :bar => 'bar')
           }.to raise_error(
             "expected #{record.inspect} to be a new String"
           )
@@ -118,11 +118,11 @@ describe "be_a_new matcher" do
       context "no attributes same" do
         it "fails" do
           expect {
-            record.should be_a_new(String).with(:zoo => 'zoo', :car => 'car')
+            expect(record).to be_a_new(String).with(:zoo => 'zoo', :car => 'car')
           }.to raise_error {|e|
-            e.message.should match(/expected #{record.inspect} to be a new String and attributes {.*} were not set on #{record.inspect}/)
-            e.message.should match(/"zoo"=>"zoo"/)
-            e.message.should match(/"car"=>"car"/)
+            expect(e.message).to match(/expected #{record.inspect} to be a new String and attributes {.*} were not set on #{record.inspect}/)
+            expect(e.message).to match(/"zoo"=>"zoo"/)
+            expect(e.message).to match(/"car"=>"car"/)
           }
         end
       end
@@ -130,7 +130,7 @@ describe "be_a_new matcher" do
       context "one attribute value not the same" do
         it "fails" do
           expect {
-            record.should be_a_new(String).with(:foo => 'bar')
+            expect(record).to be_a_new(String).with(:foo => 'bar')
           }.to raise_error(
             "expected #{record.inspect} to be a new String and " +
             %Q(attribute {"foo"=>"bar"} was not set on #{record.inspect})