rspec-rails 2.0.0.beta.13 → 2.0.0.beta.14.1

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

@@ -2,12 +2,14 @@ require "spec_helper"
 
 module RSpec::Rails
   describe ControllerExampleGroup do
-    it "is included in specs in ./spec/controllers" do
-      stub_metadata(
-        :example_group => {:file_path => "./spec/controllers/whatever_spec.rb:15"}
-      )
-      group = RSpec::Core::ExampleGroup.describe
-      group.included_modules.should include(ControllerExampleGroup)
+    it { should be_included_in_files_in('./spec/controllers/') }
+    it { should be_included_in_files_in('.\\spec\\controllers\\') }
+
+    it "includes routing matchers" do
+      group = RSpec::Core::ExampleGroup.describe do
+        include ControllerExampleGroup
+      end
+      group.included_modules.should include(RSpec::Rails::Matchers::RoutingMatchers)
     end
   end
 end

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

@@ -3,14 +3,10 @@ require "spec_helper"
 module RSpec::Rails
   describe HelperExampleGroup::InstanceMethods do
     module ::FoosHelper; end
+    subject { HelperExampleGroup }
 
-    it "is included in specs in ./spec/views" do
-      stub_metadata(
-        :example_group => {:file_path => "./spec/helpers/whatever_spec.rb:15"}
-      )
-      group = RSpec::Core::ExampleGroup.describe
-      group.included_modules.should include(HelperExampleGroup)
-    end
+    it { should be_included_in_files_in('./spec/helpers/') }
+    it { should be_included_in_files_in('.\\spec\\helpers\\') }
 
     it "provides a controller_path based on the helper module's name" do
       helper_spec = Object.new.extend HelperExampleGroup::InstanceMethods

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

@@ -2,12 +2,7 @@ require "spec_helper"
 
 module RSpec::Rails
   describe MailerExampleGroup do
-    it "is included in specs in ./spec/mailers" do
-      stub_metadata(
-        :example_group => {:file_path => "./spec/mailers/whatever_spec.rb:15"}
-      )
-      group = RSpec::Core::ExampleGroup.describe
-      group.included_modules.should include(MailerExampleGroup)
-    end
+    it { should be_included_in_files_in('./spec/mailers/') }
+    it { should be_included_in_files_in('.\\spec\\mailers\\') }
   end
 end

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

@@ -2,12 +2,7 @@ require "spec_helper"
 
 module RSpec::Rails
   describe RequestExampleGroup do
-    it "is included in specs in ./spec/requests" do
-      stub_metadata(
-        :example_group => {:file_path => "./spec/requests/whatever_spec.rb:15"}
-      )
-      group = RSpec::Core::ExampleGroup.describe
-      group.included_modules.should include(RequestExampleGroup)
-    end
+    it { should be_included_in_files_in('./spec/requests/') }
+    it { should be_included_in_files_in('.\\spec\\requests\\') }
   end
 end

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

@@ -2,12 +2,7 @@ require "spec_helper"
 
 module RSpec::Rails
   describe RoutingExampleGroup do
-    it "is included in specs in ./spec/routing" do
-      stub_metadata(
-        :example_group => {:file_path => "./spec/routing/whatever_spec.rb:15"}
-      )
-      group = RSpec::Core::ExampleGroup.describe
-      group.included_modules.should include(RoutingExampleGroup)
-    end
+    it { should be_included_in_files_in('./spec/routing/') }
+    it { should be_included_in_files_in('.\\spec\\routing\\') }
   end
 end

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

@@ -2,13 +2,8 @@ require "spec_helper"
 
 module RSpec::Rails
   describe ViewExampleGroup do
-    it "is included in specs in ./spec/views" do
-      stub_metadata(
-        :example_group => {:file_path => "./spec/views/whatever_spec.rb:15"}
-      )
-      group = RSpec::Core::ExampleGroup.describe
-      group.included_modules.should include(ViewExampleGroup)
-    end
+    it { should be_included_in_files_in('./spec/views/') }
+    it { should be_included_in_files_in('.\\spec\\views\\') }
 
     describe "#render" do
       let(:view_spec) do

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

@@ -1,7 +1,7 @@
 require "spec_helper"
 
 describe "route_to" do
-  include RSpec::Rails::RoutingSpecMatchers
+  include RSpec::Rails::Matchers::RoutingMatchers
 
   it "uses failure message from assert_routing" do
     self.stub!(:assert_routing).and_raise(
@@ -13,7 +13,7 @@ describe "route_to" do
 end
 
 describe "be_routable" do
-  include RSpec::Rails::RoutingSpecMatchers
+  include RSpec::Rails::Matchers::RoutingMatchers
   attr_reader :routes
 
   before { @routes = double("routes") }

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

@@ -14,6 +14,37 @@ describe "mock_model(RealModel)" do
     end
   end
 
+  describe "destroy" do
+    it "sets id to nil" do
+      model = mock_model(MockableModel)
+      model.destroy
+      model.id.should be_nil
+    end
+  end
+
+  describe "errors" do
+    context "default" do
+      it "is empty" do
+        model = mock_model(MockableModel)
+        model.errors.should be_empty
+      end
+    end
+
+    context "with :save => false" do
+      it "is not empty" do
+        model = mock_model(MockableModel, :save => false)
+        model.errors.should_not be_empty
+      end
+    end
+
+    context "with :update_attributes => false" do
+      it "is not empty" do
+        model = mock_model(MockableModel, :save => false)
+        model.errors.should_not be_empty
+      end
+    end
+  end
+
   describe "with params" do
     it "does not mutate its parameters" do
       params = {:a => 'b'}

data/spec/spec_helper.rb

@@ -1,6 +1,9 @@
 require 'bundler'
 Bundler.setup
 
+require 'active_record'
+require 'action_controller'
+require 'action_mailer'
 require 'rspec/rails'
 
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
@@ -17,7 +20,22 @@ class RSpec::Core::ExampleGroup
   end
 end
 
+module MatchesForRSpecRailsSpecs
+  extend RSpec::Matchers::DSL
+
+  matcher :be_included_in_files_in do |path|
+    match do |mod|
+      stub_metadata(
+        :example_group => {:file_path => "#{path}whatever_spec.rb:15"}
+      )
+      group = RSpec::Core::ExampleGroup.describe
+      group.included_modules.include?(mod)
+    end
+  end
+end
+
 RSpec.configure do |c|
+  c.include MatchesForRSpecRailsSpecs
   c.color_enabled = !in_editor?
   c.before(:each) do
     @real_world = RSpec.world

data/templates/generate_stuff.rb

@@ -4,7 +4,7 @@ generate('integration_test widgets')
 generate('mailer Notifications signup')
 generate('model thing name:string')
 generate('helper things')
-generate('scaffold widget name:string')
+generate('scaffold widget name:string category:string instock:boolean')
 generate('observer widget')
 generate('scaffold gadget ') # scaffold with no attributes
 

metadata

@@ -1,14 +1,16 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-rails
 version: !ruby/object:Gem::Version 
+  hash: 124392765
   prerelease: true
   segments: 
   - 2
   - 0
   - 0
   - beta
-  - 13
-  version: 2.0.0.beta.13
+  - 14
+  - 1
+  version: 2.0.0.beta.14.1
 platform: ruby
 authors: 
 - David Chelimsky
@@ -17,39 +19,43 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-23 00:00:00 -05:00
+date: 2010-06-27 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 
+    none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
+        hash: 62196479
         segments: 
         - 2
         - 0
         - 0
         - beta
-        - 13
-        version: 2.0.0.beta.13
+        - 14
+        version: 2.0.0.beta.14
   requirement: *id001
-  prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :runtime
+  prerelease: false
   name: webrat
   version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         - 7
         - 0
         version: 0.7.0
   requirement: *id002
-  prerelease: false
 description: RSpec-2 for Rails-3
 email: dchelimsky@gmail.com;chad.humphries@gmail.com
 executables: []
@@ -68,13 +74,13 @@ files:
 - VERSION
 - autotest/discover.rb
 - cucumber.yml
-- features/controller_specs/do_not_render_views.feature
+- features/controller_specs/isolation_from_views.feature
 - features/controller_specs/readers.feature
 - features/controller_specs/render_views.feature
+- features/matchers/be_routable_matcher.feature
 - features/matchers/new_record_matcher.feature
 - features/model_specs/errors_on.feature
 - features/model_specs/transactional_examples.feature
-- features/routing_specs/be_routable_matcher.feature
 - features/step_definitions/model_steps.rb
 - features/support/env.rb
 - features/view_specs/view_spec.feature
@@ -128,8 +134,9 @@ files:
 - lib/rspec/rails/matchers/have_extension.rb
 - lib/rspec/rails/matchers/redirect_to.rb
 - lib/rspec/rails/matchers/render_template.rb
-- lib/rspec/rails/matchers/routing_spec_matchers.rb
+- 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/version.rb
@@ -164,7 +171,7 @@ licenses: []
 post_install_message: |
   **************************************************
   
-    Thank you for installing rspec-rails-2.0.0.beta.13!
+    Thank you for installing rspec-rails-2.0.0.beta.14.1!
   
     This version of rspec-rails only works with 
     versions of rails >= 3.0.0.pre.
@@ -174,6 +181,9 @@ post_install_message: |
   
       script/rails generate rspec:install
   
+    Also, be sure to look at Upgrade.markdown to see 
+    what might have changed since the last release.
+  
   **************************************************
 
 rdoc_options: 
@@ -181,16 +191,20 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
+      hash: 25
       segments: 
       - 1
       - 3
@@ -199,10 +213,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rspec
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: rspec-rails-2.0.0.beta.13
+summary: rspec-rails-2.0.0.beta.14.1
 test_files: 
 - spec/rspec/rails/example/controller_example_group_spec.rb
 - spec/rspec/rails/example/helper_example_group_spec.rb