rspec-rails 2.99.0.beta1 → 2.99.0.beta2

data/spec/rspec/rails/mocks/stub_model_spec.rb

@@ -8,7 +8,7 @@ describe "stub_model" do
         model = stub_model(model_class) do |block_arg|
           @block_arg = block_arg
         end
-        model.should be(@block_arg)
+        expect(model).to be(@block_arg)
       end
     end
 
@@ -16,14 +16,14 @@ describe "stub_model" do
       context "default" do
         it "returns true" do
           model = stub_model(model_class)
-          model.should be_persisted
+          expect(model).to be_persisted
         end
       end
 
       context "with as_new_record" do
         it "returns false" do
           model = stub_model(model_class).as_new_record
-          model.should_not be_persisted
+          expect(model).not_to be_persisted
         end
       end
     end
@@ -31,12 +31,12 @@ describe "stub_model" do
     it "increments the value returned by to_param" do
       first = stub_model(model_class)
       second = stub_model(model_class)
-      second.to_param.to_i.should == (first.to_param.to_i + 1)
+      expect(second.to_param.to_i).to eq(first.to_param.to_i + 1)
     end
 
     describe "#blank?" do
       it "is false" do
-        stub_model(model_class).should_not be_blank
+        expect(stub_model(model_class)).not_to be_blank
       end
     end
   end
@@ -58,79 +58,79 @@ describe "stub_model" do
       context "default" do
         it "returns false" do
           model = stub_model(model_class)
-          model.new_record?.should be_falsey
+          expect(model.new_record?).to be_falsey
         end
       end
 
       context "with as_new_record" do
         it "returns true" do
           model = stub_model(model_class).as_new_record
-          model.new_record?.should be_truthy
+          expect(model.new_record?).to be_truthy
         end
       end
     end
 
     describe "defaults" do
       it "has an id" do
-        stub_model(MockableModel).id.should be > 0
+        expect(stub_model(MockableModel).id).to be > 0
       end
 
       it "says it is not a new record" do
-        stub_model(MockableModel).should_not be_new_record
+        expect(stub_model(MockableModel)).not_to be_new_record
       end
     end
 
     describe "#as_new_record" do
       it "has a nil id" do
-        stub_model(MockableModel).as_new_record.id.should be(nil)
+        expect(stub_model(MockableModel).as_new_record.id).to be(nil)
       end
     end
 
     it "raises when hitting the db" do
-      lambda do
+      expect do
         stub_model(MockableModel).connection
-      end.should raise_error(RSpec::Rails::IllegalDataAccessException, /stubbed models are not allowed to access the database/)
+      end.to raise_error(RSpec::Rails::IllegalDataAccessException, /stubbed models are not allowed to access the database/)
     end
 
     it "increments the id" do
       first = stub_model(model_class)
       second = stub_model(model_class)
-      second.id.should == (first.id + 1)
+      expect(second.id).to eq(first.id + 1)
     end
 
     it "accepts a stub id" do
-      stub_model(MockableModel, :id => 37).id.should == 37
+      expect(stub_model(MockableModel, :id => 37).id).to eq(37)
     end
 
     it "says it is a new record when id is set to nil" do
-      stub_model(MockableModel, :id => nil).should be_new_record
+      expect(stub_model(MockableModel, :id => nil)).to be_new_record
     end
 
     it "accepts a stub for save" do
-      stub_model(MockableModel, :save => false).save.should be(false)
+      expect(stub_model(MockableModel, :save => false).save).to be(false)
     end
 
     describe "alternate primary key" do
       it "has the correct primary_key name" do
-        stub_model(AlternatePrimaryKeyModel).class.primary_key.to_s.should eq('my_id')
+        expect(stub_model(AlternatePrimaryKeyModel).class.primary_key.to_s).to eq('my_id')
       end
 
       it "has a primary_key" do
-        stub_model(AlternatePrimaryKeyModel).my_id.should be > 0
+        expect(stub_model(AlternatePrimaryKeyModel).my_id).to be > 0
       end
 
       it "says it is not a new record" do
         stub_model(AlternatePrimaryKeyModel) do |m|
-          m.should_not be_new_record
+          expect(m).not_to be_new_record
         end
       end
 
       it "says it is a new record if primary_key is nil" do
-        stub_model(AlternatePrimaryKeyModel, :my_id => nil).should be_new_record
+        expect(stub_model(AlternatePrimaryKeyModel, :my_id => nil)).to be_new_record
       end
 
       it "accepts a stub for the primary_key" do
-        stub_model(AlternatePrimaryKeyModel, :my_id => 5).my_id.should == 5
+        expect(stub_model(AlternatePrimaryKeyModel, :my_id => 5).my_id).to eq(5)
       end
     end
 
@@ -142,11 +142,11 @@ describe "stub_model" do
       end
 
       it "passes associated_model == mock" do
-        @stub_model.should == @real.mockable_model
+        expect(@stub_model).to eq(@real.mockable_model)
       end
 
       it "passes mock == associated_model" do
-        @real.mockable_model.should == @stub_model
+        expect(@real.mockable_model).to eq(@stub_model)
       end
     end
 

data/spec/rspec/rails/setup_and_teardown_adapter_spec.rb

@@ -8,8 +8,8 @@ describe RSpec::Rails::SetupAndTeardownAdapter do
         def self.foo; "foo"; end
         def self.bar; "bar"; end
       end
-      klass.should_receive(:before).ordered { |&block| block.call.should eq "foo" }
-      klass.should_receive(:before).ordered { |&block| block.call.should eq "bar" }
+      expect(klass).to receive(:before).ordered { |&block| expect(block.call).to eq "foo" }
+      expect(klass).to receive(:before).ordered { |&block| expect(block.call).to eq "bar" }
 
       klass.setup :foo
       klass.setup :bar
@@ -22,8 +22,8 @@ describe RSpec::Rails::SetupAndTeardownAdapter do
         def self.setup_controller_request_and_response; "setup controller"  end
       end
 
-      klass.should_receive(:prepend_before) { |&block| block.call.should eq "setup fixtures" }
-      klass.should_receive(:prepend_before) { |&block| block.call.should eq "setup controller" }
+      expect(klass).to receive(:prepend_before) { |&block| expect(block.call).to eq "setup fixtures" }
+      expect(klass).to receive(:prepend_before) { |&block| expect(block.call).to eq "setup controller" }
 
       klass.setup :setup_fixtures
       klass.setup :setup_controller_request_and_response

data/spec/rspec/rails/view_rendering_spec.rb

@@ -14,11 +14,11 @@ module RSpec::Rails
     context "default" do
       context "ActionController::Base" do
         it "does not render views" do
-          group.new.render_views?.should be_falsey
+          expect(group.new.render_views?).to be_falsey
         end
 
         it "does not render views in a nested group" do
-          group.describe{}.new.render_views?.should be_falsey
+          expect(group.describe{}.new.render_views?).to be_falsey
         end
       end
 
@@ -28,7 +28,7 @@ module RSpec::Rails
             def example.controller
               ActionController::Metal.new
             end
-            example.render_views?.should be_truthy
+            expect(example.render_views?).to be_truthy
           end
         end
       end
@@ -38,27 +38,27 @@ module RSpec::Rails
       context "with no args" do
         it "tells examples to render views" do
           group.render_views
-          group.new.render_views?.should be_truthy
+          expect(group.new.render_views?).to be_truthy
         end
       end
 
       context "with true" do
         it "tells examples to render views" do
           group.render_views true
-          group.new.render_views?.should be_truthy
+          expect(group.new.render_views?).to be_truthy
         end
       end
 
       context "with false" do
         it "tells examples not to render views" do
           group.render_views false
-          group.new.render_views?.should be_falsey
+          expect(group.new.render_views?).to be_falsey
         end
 
         it "overrides the global config if render_views is enabled there" do
-          RSpec.configuration.stub(:render_views?).and_return true
+          allow(RSpec.configuration).to receive(:render_views?).and_return true
           group.render_views false
-          group.new.render_views?.should be_falsey
+          expect(group.new.render_views?).to be_falsey
         end
       end
 
@@ -70,40 +70,40 @@ module RSpec::Rails
         context "with no args" do
           it "tells examples to render views" do
             nested_group.render_views
-            nested_group.new.render_views?.should be_truthy
+            expect(nested_group.new.render_views?).to be_truthy
           end
         end
 
         context "with true" do
           it "tells examples to render views" do
             nested_group.render_views true
-            nested_group.new.render_views?.should be_truthy
+            expect(nested_group.new.render_views?).to be_truthy
           end
         end
 
         context "with false" do
           it "tells examples not to render views" do
             nested_group.render_views false
-            nested_group.new.render_views?.should be_falsey
+            expect(nested_group.new.render_views?).to be_falsey
           end
         end
 
         it "leaves the parent group as/is" do
           group.render_views
           nested_group.render_views false
-          group.new.render_views?.should be_truthy
+          expect(group.new.render_views?).to be_truthy
         end
 
         it "overrides the value inherited from the parent group" do
           group.render_views
           nested_group.render_views false
-          nested_group.new.render_views?.should be_falsey
+          expect(nested_group.new.render_views?).to be_falsey
         end
 
         it "passes override to children" do
           group.render_views
           nested_group.render_views false
-          nested_group.describe{}.new.render_views?.should be_falsey
+          expect(nested_group.describe{}.new.render_views?).to be_falsey
         end
       end
     end

data/spec/spec_helper.rb

@@ -2,6 +2,7 @@ require 'rails/all'
 
 module RSpecRails
   class Application < ::Rails::Application
+    self.config.secret_key_base = 'ASecretString' if config.respond_to? :secret_key_base
   end
 end
 

data/spec/support/helpers.rb

@@ -1,7 +1,7 @@
 module Helpers
   def stub_metadata(additional_metadata)
     stub_metadata = metadata_with(additional_metadata)
-    RSpec::Core::ExampleGroup.stub(:metadata) { stub_metadata }
+    allow(RSpec::Core::ExampleGroup).to receive(:metadata) { stub_metadata }
   end
 
   def metadata_with(additional_metadata)
@@ -16,5 +16,19 @@ module Helpers
     m
   end
 
+  def with_isolated_config
+    original_config = RSpec.configuration
+    RSpec.configuration = RSpec::Core::Configuration.new
+    RSpec.configure do |c|
+      c.include RSpec::Rails::FixtureSupport
+      c.add_setting :use_transactional_fixtures, :alias_with => :use_transactional_examples
+      c.add_setting :use_instantiated_fixtures
+      c.add_setting :global_fixtures
+      c.add_setting :fixture_path
+    end
+    yield
+    RSpec.configuration = original_config
+  end
+
   RSpec.configure {|c| c.include self}
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-rails
 version: !ruby/object:Gem::Version
-  version: 2.99.0.beta1
+  version: 2.99.0.beta2
 platform: ruby
 authors:
 - David Chelimsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-07 00:00:00.000000000 Z
+date: 2014-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -72,42 +72,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.99.0.beta1
+        version: 2.99.0.beta2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.99.0.beta1
+        version: 2.99.0.beta2
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.99.0.beta1
+        version: 2.99.0.beta2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.99.0.beta1
+        version: 2.99.0.beta2
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.99.0.beta1
+        version: 2.99.0.beta2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.99.0.beta1
+        version: 2.99.0.beta2
+- !ruby/object:Gem::Dependency
+  name: rspec-collection_matchers
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -154,16 +168,16 @@ dependencies:
   name: ZenTest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 4.9.0
+        version: 4.9.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 4.9.0
+        version: 4.9.5
 - !ruby/object:Gem::Dependency
   name: ammeter
   requirement: !ruby/object:Gem::Requirement
@@ -278,6 +292,7 @@ files:
 - features/controller_specs/README.md
 - features/controller_specs/anonymous_controller.feature
 - features/controller_specs/bypass_rescue.feature
+- features/controller_specs/capybara.feature
 - features/controller_specs/controller_spec.feature
 - features/controller_specs/engine_routes.feature
 - features/controller_specs/isolation_from_views.feature
@@ -379,7 +394,7 @@ rubyforge_project: rspec
 rubygems_version: 2.0.7
 signing_key: 
 specification_version: 4
-summary: rspec-rails-2.99.0.beta1
+summary: rspec-rails-2.99.0.beta2
 test_files:
 - features/Autotest.md
 - features/Generators.md
@@ -392,6 +407,7 @@ test_files:
 - features/controller_specs/README.md
 - features/controller_specs/anonymous_controller.feature
 - features/controller_specs/bypass_rescue.feature
+- features/controller_specs/capybara.feature
 - features/controller_specs/controller_spec.feature
 - features/controller_specs/engine_routes.feature
 - features/controller_specs/isolation_from_views.feature