rspec-rails 2.0.0.beta.19 → 2.0.0.beta.20

data/spec/rspec/rails/assertion_adapter_spec.rb

@@ -0,0 +1,28 @@
+require "spec_helper"
+
+describe RSpec::Rails::TestUnitAssertionAdapter do
+  include RSpec::Rails::TestUnitAssertionAdapter
+
+  Test::Unit::Assertions.public_instance_methods.select{|m| m.to_s =~ /^assert/}.each do |m|
+    if m.to_s == "assert_equal"
+      it "exposes #{m} to host examples" do
+        assert_equal 3,3
+        expect do
+          assert_equal 3,4
+        end.to raise_error(ActiveSupport::TestCase::Assertion)
+      end
+    else
+      it "exposes #{m} to host examples" do
+        methods.should include(m)
+      end
+    end
+  end
+
+  it "does not expose internal methods of MiniTest" do
+    methods.should_not include("_assertions")
+  end
+
+  it "does not expose MiniTest's message method" do
+    methods.should_not include("message")
+  end
+end

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

@@ -24,7 +24,9 @@ module RSpec::Rails
     describe "#helper" do
       it "returns the instance of AV::Base provided by AV::TC::Behavior" do
         helper_spec = Object.new.extend HelperExampleGroup::InstanceMethods
+        helper_spec.should_receive(:_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)
       end

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

@@ -11,5 +11,22 @@ module RSpec::Rails
       end
       group.metadata[:type].should eq(:routing)
     end
+
+    describe "named routes" do
+      it "delegates them to the route_set" do
+        group = RSpec::Core::ExampleGroup.describe do
+          include RoutingExampleGroup
+        end
+
+        example = group.new
+
+        # Yes, this is quite invasive
+        url_helpers = double('url_helpers', :foo_path => "foo")
+        routes = double('routes', :url_helpers => url_helpers)
+        example.stub(:routes => routes)
+
+        example.foo_path.should == "foo"
+      end
+    end
   end
 end

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

@@ -5,9 +5,14 @@ module RSpec::Rails
     it "doesn't render views by default" do
       rendering_views = nil
       group = RSpec::Core::ExampleGroup.describe do
-        include ControllerExampleGroup
-        rendering_views = render_views?
-        it("does something") {}
+        before(:each) do
+          @controller = double("controller")
+          @controller.stub_chain("class.respond_to?").and_return(true)
+        end
+        include ViewRendering
+        it("does something") do
+          rendering_views = render_views?
+        end
       end
       group.run(double.as_null_object)
       rendering_views.should be_false
@@ -16,23 +21,49 @@ module RSpec::Rails
     it "doesn't render views by default in a nested group" do
       rendering_views = nil
       group = RSpec::Core::ExampleGroup.describe do
-        include ControllerExampleGroup
+        before(:each) do
+          @controller = double("controller")
+          @controller.stub_chain("class.respond_to?").and_return(true)
+        end
+        include ViewRendering
         describe "nested" do
-          rendering_views = render_views?
-          it("does something") {}
+          it("does something") do
+            rendering_views = render_views?
+          end
         end
       end
       group.run(double.as_null_object)
       rendering_views.should be_false
     end
 
+    it "renders views if controller does not respond to view_paths (ActionController::Metal)" do
+      rendering_views = false
+      group = RSpec::Core::ExampleGroup.describe do
+        before(:each) do
+          @controller = double("controller")
+          @controller.stub_chain("class.respond_to?").and_return(false)
+        end
+        include ViewRendering
+        it("does something") do
+          rendering_views = render_views?
+        end
+      end
+      group.run(double.as_null_object)
+      rendering_views.should be_true
+    end
+
     it "renders views if told to" do
       rendering_views = false
       group = RSpec::Core::ExampleGroup.describe do
-        include ControllerExampleGroup
+        before(:each) do
+          @controller = double("controller")
+          @controller.stub_chain("class.respond_to?").and_return(true)
+        end
+        include ViewRendering
         render_views
-        rendering_views = render_views?
-        it("does something") {}
+        it("does something") do
+          rendering_views = render_views?
+        end
       end
       group.run(double.as_null_object)
       rendering_views.should be_true
@@ -41,11 +72,16 @@ module RSpec::Rails
     it "renders views if told to in a nested group" do
       rendering_views = nil
       group = RSpec::Core::ExampleGroup.describe do
-        include ControllerExampleGroup
+        before(:each) do
+          @controller = double("controller")
+          @controller.stub_chain("class.respond_to?").and_return(true)
+        end
+        include ViewRendering
         describe "nested" do
           render_views
-          rendering_views = render_views?
-          it("does something") {}
+          it("does something") do
+            rendering_views = render_views?
+          end
         end
       end
       group.run(double.as_null_object)
@@ -55,11 +91,16 @@ module RSpec::Rails
     it "renders views in a nested group if told to in an outer group" do
       rendering_views = nil
       group = RSpec::Core::ExampleGroup.describe do
-        include ControllerExampleGroup
+        before(:each) do
+          @controller = double("controller")
+          @controller.stub_chain("class.respond_to?").and_return(true)
+        end
+        include ViewRendering
         render_views
         describe "nested" do
-          rendering_views = render_views?
-          it("does something") {}
+          it("does something") do
+            rendering_views = render_views?
+          end
         end
       end
       group.run(double.as_null_object)

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

@@ -36,4 +36,102 @@ describe "be_a_new matcher" do
       end
     end
   end
+
+  describe "#with" do
+    context "right class and new record" do
+      let(:record) do
+        Class.new do
+          def initialize(attributes)
+            @attributes = attributes
+          end
+
+          def attributes
+            @attributes.stringify_keys
+          end
+
+          def new_record?; true; end
+        end.new(:foo => 'foo', :bar => 'bar')
+      end
+
+      context "all attributes same" do
+        it "passes" do
+          record.should 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')
+        end
+      end
+
+      context "no attributes same" do
+        it "fails" do
+          expect {
+            record.should be_a_new(record.class).with(:zoo => 'zoo', :car => 'car')
+          }.to raise_error(
+            %Q(attributes {"zoo"=>"zoo", "car"=>"car"} were not set on #{record.inspect})
+          )
+        end
+      end
+
+      context "one attribute value not the same" do
+        it "fails" do
+          expect {
+            record.should be_a_new(record.class).with(:foo => 'bar')
+          }.to raise_error(
+            %Q(attribute {"foo"=>"bar"} was not set on #{record.inspect})
+          )
+        end
+      end
+    end
+
+    context "wrong class and existing record" do
+      let(:record) do
+        Class.new do
+          def initialize(attributes)
+            @attributes = attributes
+          end
+
+          def attributes
+            @attributes.stringify_keys
+          end
+
+          def new_record?; false; end
+        end.new(:foo => 'foo', :bar => 'bar')
+      end
+
+      context "all attributes same" do
+        it "fails" do
+          expect {
+            record.should be_a_new(String).with(:foo => 'foo', :bar => 'bar')
+          }.to raise_error(
+            "expected #{record.inspect} to be a new String"
+          )
+        end
+      end
+
+      context "no attributes same" do
+        it "fails" do
+          expect {
+            record.should be_a_new(String).with(:zoo => 'zoo', :car => 'car')
+          }.to raise_error(
+            "expected #{record.inspect} to be a new String and " +
+            %Q(attributes {"zoo"=>"zoo", "car"=>"car"} were not set on #{record.inspect})
+          )
+        end
+      end
+
+      context "one attribute value not the same" do
+        it "fails" do
+          expect {
+            record.should 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})
+          )
+        end
+      end
+    end
+  end
 end

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

@@ -1,11 +1,11 @@
 require "spec_helper"
 
 describe "error_on" do
-  it "should provide a description including the name of what the error is on" do
+  it "provides a description including the name of what the error is on" do
     have(1).error_on(:whatever).description.should == "have 1 error on :whatever"
   end
 
-  it "should provide a failure message including the number actually given" do
+  it "provides a failure message including the number actually given" do
     lambda {
       [].should have(1).error_on(:whatever)
     }.should raise_error("expected 1 error on :whatever, got 0")
@@ -13,11 +13,11 @@ describe "error_on" do
 end
 
 describe "errors_on" do
-  it "should provide a description including the name of what the error is on" do
+  it "provides a description including the name of what the error is on" do
     have(2).errors_on(:whatever).description.should == "have 2 errors on :whatever"
   end
 
-  it "should provide a failure message including the number actually given" do
+  it "provides a failure message including the number actually given" do
     lambda {
       [1].should have(3).errors_on(:whatever)
     }.should raise_error("expected 3 errors on :whatever, got 1")

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

@@ -24,3 +24,20 @@ class AssociatedModel < ActiveRecord::Base
   include NoConnections
   belongs_to :mockable_model
 end
+
+class AlternatePrimaryKeyModel < ActiveRecord::Base
+  include NoConnections
+  self.primary_key = :my_id
+  attr_accessor :my_id
+end
+
+class ConnectableModel < ActiveRecord::Base
+  establish_connection :adapter => 'sqlite3',
+                       :database => ':memory:'
+
+  connection.execute <<-eosql
+    CREATE TABLE connectable_models (
+      id integer PRIMARY KEY AUTOINCREMENT
+    )
+  eosql
+end

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

@@ -3,49 +3,70 @@ require File.dirname(__FILE__) + '/ar_classes'
 
 describe "stub_model" do
   describe "defaults" do
-    it "should have an id" do
+    it "has an id" do
       stub_model(MockableModel).id.should be > 0
     end
 
-    it "should say it is not a new record" do
+    it "says it is not a new record" do
       stub_model(MockableModel).should_not be_new_record
     end
   end
 
-  it "should accept a stub id" do
+  it "accepts a stub id" do
     stub_model(MockableModel, :id => 37).id.should == 37
   end
 
-  it "should say it is a new record when id is set to nil" do
+  it "says it is a new record when id is set to nil" do
     stub_model(MockableModel, :id => nil).should be_new_record
   end
 
-  it "should accept any arbitrary stub" do
+  it "accepts any arbitrary stub" do
     stub_model(MockableModel, :foo => "bar").foo.should == "bar"
   end
 
-  it "should accept a stub for save" do
+  it "accepts a stub for save" do
     stub_model(MockableModel, :save => false).save.should be(false)
   end
+  
+  describe "alternate primary key" do
+    it "has the correct primary_key name" do
+      stub_model(AlternatePrimaryKeyModel).class.primary_key.should eql('my_id')
+    end
+    
+    it "has a primary_key" do
+      stub_model(AlternatePrimaryKeyModel).my_id.should be > 0
+    end
+    
+    it "does not say it is a new record" do
+      stub_model(AlternatePrimaryKeyModel).should_not be_new_record
+    end
+    
+    it "says it is a new record if primary_key is nil" do
+      stub_model(AlternatePrimaryKeyModel, :my_id => nil).should be_new_record
+    end
+    
+    it "accepts a stub for the primary_key" do
+      stub_model(AlternatePrimaryKeyModel, :my_id => 5).my_id.should == 5
+    end
+  end
 
   describe "#as_new_record" do
-    it "should say it is a new record" do
+    it "says it is a new record" do
       stub_model(MockableModel).as_new_record.should be_new_record
     end
 
-    it "should have a nil id" do
+    it "has a nil id" do
       stub_model(MockableModel).as_new_record.id.should be(nil)
     end
   end
 
-  pending "should raise when hitting the db" do
+  it "raises when hitting the db" do
     lambda do
-      model = stub_model(MockableModel, :changed => true, :attributes_with_quotes => {'this' => 'that'})
-      model.save
+      stub_model(ConnectableModel).connection
     end.should raise_error(RSpec::Rails::IllegalDataAccessException, /stubbed models are not allowed to access the database/)
   end
 
-  it "should increment the id" do
+  it "increments the id" do
     first = stub_model(MockableModel)
     second = stub_model(MockableModel)
     second.id.should == (first.id + 1)
@@ -58,17 +79,17 @@ describe "stub_model" do
       @real.mockable_model = @stub_model
     end
 
-    it "should pass associated_model == mock" do
+    it "passes associated_model == mock" do
         @stub_model.should == @real.mockable_model
     end
 
-    it "should pass mock == associated_model" do
+    it "passes mock == associated_model" do
         @real.mockable_model.should == @stub_model
     end
   end
 
   describe "with a block" do
-    it "should yield the model" do
+    it "yields the model" do
       model = stub_model(MockableModel) do |block_arg|
         @block_arg = block_arg
       end

data/templates/Gemfile

@@ -11,4 +11,6 @@ group :development, :test do
   gem "rspec-core",         :path => "../../../rspec-core"
   gem "rspec-expectations", :path => "../../../rspec-expectations"
   gem "rspec-mocks",        :path => "../../../rspec-mocks"
+  gem "rcov"
+  gem "webrat"
 end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-rails
 version: !ruby/object:Gem::Version 
-  hash: 62196421
   prerelease: true
   segments: 
   - 2
   - 0
   - 0
   - beta
-  - 19
-  version: 2.0.0.beta.19
+  - 20
+  version: 2.0.0.beta.20
 platform: ruby
 authors: 
 - David Chelimsky
@@ -18,45 +17,26 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-25 00:00:00 -05:00
+date: 2010-08-24 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  prerelease: false
   name: rspec
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 62196421
         segments: 
         - 2
         - 0
         - 0
         - beta
-        - 19
-        version: 2.0.0.beta.19
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
+        - 20
+        version: 2.0.0.beta.20
   type: :runtime
   prerelease: false
-  name: webrat
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 62196417
-        segments: 
-        - 0
-        - 7
-        - 2
-        - beta
-        - 1
-        version: 0.7.2.beta.1
-  requirement: *id002
+  version_requirements: *id001
 description: RSpec-2 for Rails-3
 email: dchelimsky@gmail.com;chad.humphries@gmail.com
 executables: []
@@ -69,6 +49,7 @@ files:
 - .document
 - .gitignore
 - Gemfile
+- Gotchas.markdown
 - README.markdown
 - Rakefile
 - Upgrade.markdown
@@ -80,13 +61,20 @@ files:
 - features/controller_specs/isolation_from_views.feature
 - features/controller_specs/readers.feature
 - features/controller_specs/render_views.feature
+- features/helper_specs/helper_spec.feature
 - features/mailer_specs/url_helpers.feature
 - features/matchers/be_routable_matcher.feature
 - features/matchers/new_record_matcher.feature
+- features/matchers/redirect_to_matcher.feature
+- features/matchers/render_template_matcher.feature
+- features/mocks/mock_model.feature
+- features/mocks/stub_model.feature
 - features/model_specs/errors_on.feature
 - features/model_specs/transactional_examples.feature
+- features/routing_specs/access_to_named_routes.feature
 - features/step_definitions/model_steps.rb
 - features/support/env.rb
+- features/view_specs/inferred_controller_path.feature
 - features/view_specs/view_spec.feature
 - lib/autotest/rails_rspec2.rb
 - lib/generators/rspec.rb
@@ -121,11 +109,13 @@ files:
 - lib/rspec-rails.rb
 - lib/rspec/rails.rb
 - lib/rspec/rails/adapters.rb
+- lib/rspec/rails/browser_simulators.rb
 - lib/rspec/rails/example.rb
 - lib/rspec/rails/example/controller_example_group.rb
 - lib/rspec/rails/example/helper_example_group.rb
 - lib/rspec/rails/example/mailer_example_group.rb
 - lib/rspec/rails/example/model_example_group.rb
+- lib/rspec/rails/example/rails_example_group.rb
 - lib/rspec/rails/example/request_example_group.rb
 - lib/rspec/rails/example/routing_example_group.rb
 - lib/rspec/rails/example/view_example_group.rb
@@ -140,13 +130,12 @@ files:
 - lib/rspec/rails/matchers/routing_matchers.rb
 - lib/rspec/rails/mocks.rb
 - lib/rspec/rails/module_inclusion.rb
-- lib/rspec/rails/monkey.rb
-- lib/rspec/rails/monkey/action_mailer/test_case.rb
 - lib/rspec/rails/tasks/rspec.rake
 - lib/rspec/rails/version.rb
 - lib/rspec/rails/view_assigns.rb
 - lib/rspec/rails/view_rendering.rb
 - rspec-rails.gemspec
+- spec/rspec/rails/assertion_adapter_spec.rb
 - spec/rspec/rails/example/controller_example_group_spec.rb
 - spec/rspec/rails/example/helper_example_group_spec.rb
 - spec/rspec/rails/example/mailer_example_group_spec.rb
@@ -176,7 +165,7 @@ licenses: []
 post_install_message: |
   **************************************************
   
-    Thank you for installing rspec-rails-2.0.0.beta.19!
+    Thank you for installing rspec-rails-2.0.0.beta.20!
   
     This version of rspec-rails only works with versions of rails >= 3.0.0.beta.4.
   
@@ -186,7 +175,7 @@ post_install_message: |
     can access its generators and rake tasks.
   
       group :development, :test do
-        gem "rspec-rails", ">= 2.0.0.beta.19"
+        gem "rspec-rails", ">= 2.0.0.beta.20"
       end
   
     Be sure to run the following command in each of your Rails apps if you're
@@ -217,7 +206,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 4009655746568462970
       segments: 
       - 0
       version: "0"
@@ -226,7 +215,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
-      hash: 25
       segments: 
       - 1
       - 3
@@ -238,8 +226,9 @@ rubyforge_project: rspec
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: rspec-rails-2.0.0.beta.19
+summary: rspec-rails-2.0.0.beta.20
 test_files: 
+- spec/rspec/rails/assertion_adapter_spec.rb
 - spec/rspec/rails/example/controller_example_group_spec.rb
 - spec/rspec/rails/example/helper_example_group_spec.rb
 - spec/rspec/rails/example/mailer_example_group_spec.rb