rspec-rails 2.2.1 → 2.3.0

data/Gemfile

@@ -1,24 +1,42 @@
 source "http://rubygems.org"
 
-gem "rails", :path => File.expand_path("../vendor/rails", __FILE__)
-gem "rack", :git => "git://github.com/rack/rack.git"
-
-%w[rspec-rails rspec rspec-core rspec-expectations rspec-mocks].each do |lib|
-  gem lib, :path => File.expand_path("../../#{lib}", __FILE__)
+%w[rspec rspec-core rspec-expectations rspec-mocks].each do |lib|
+  library_path = File.expand_path("../../#{lib}", __FILE__)
+  if File.exist?(library_path)
+    gem lib, :path => library_path
+  else
+    gem lib
+  end
 end
 
-gem "cucumber", :git => "git://github.com/dchelimsky/cucumber", :branch => "update-gemspec"
+gem "rake", "0.8.7"
+gem "cucumber", "0.9.4"
 gem "aruba", "0.2.2"
-gem 'webrat', "0.7.2"
-gem 'sqlite3-ruby', :require => 'sqlite3'
-gem 'relish'
+gem "rcov", "0.9.9"
+gem "relish", "0.2.0"
+gem "guard-rspec", "0.1.9"
+gem "growl", "1.0.3"
+gem "ZenTest", "~> 4.4.2"
+
+if RUBY_PLATFORM =~ /darwin/
+  gem "autotest-fsevent", "~> 0.2.4"
+  gem "autotest-growl", "~> 0.2.9"
+end
 
-gem 'autotest'
+gem "ruby-debug", :platforms => :ruby_18
+gem "ruby-debug19", "~> 0.11.6", :platforms => :ruby_19
 
-platforms :mri_19 do
-  gem 'ruby-debug19'
+platforms :ruby_18, :ruby_19 do
+  gem "rb-fsevent", "~> 0.3.9"
+  gem "ruby-prof", "~> 0.9.2"
 end
 
-platforms :mri_18 do
-  gem 'ruby-debug'
+platforms :jruby do
+  gem "jruby-openssl"
 end
+
+#### rspec-rails only
+gem "rails", :path => File.expand_path("../vendor/rails", __FILE__)
+gem "rack", :git => "git://github.com/rack/rack.git"
+gem 'webrat', "0.7.2"
+gem 'sqlite3-ruby', :require => 'sqlite3'

data/History.md

@@ -1,5 +1,13 @@
 ## rspec-rails-2 release history
 
+### 2.3.0 / 2010-12-12
+
+[full changelog](http://github.com/rspec/rspec-rails/compare/v2.2.1...v2.3.0)
+
+* Changes
+  * Generator no longer generates autotest/autodiscover.rb, as it is no longer
+    needed (as of rspec-core-2.3.0)
+
 ### 2.2.1 / 2010-12-01
 
 [full changelog](http://github.com/rspec/rspec-rails/compare/v2.2.0...v2.2.1)

data/README.md

@@ -6,10 +6,10 @@ NOTE: rspec-2 does _not_ support rails-2. Use rspec-rails-1.3.x for rails-2.
 
 ## Documentation
 
-The [Cucumber features](http://relishapp.com/rspec/rspec-rails/v/2-2) are the
+The [Cucumber features](http://relishapp.com/rspec/rspec-rails) are the
 most comprehensive and up-to-date docs for end-users.
 
-The [RDoc](http://rubydoc.info/gems/rspec-rails/2.2.1/frames) provides additional
+The [RDoc](http://rubydoc.info/gems/rspec-rails/2.3.0/frames) provides additional
 information for contributors and/or extenders.
 
 All of the documentation is open source and a work in progress. If you find it

data/Upgrade.markdown

@@ -1,4 +1,14 @@
-# Upgrade to rspec-rails-2
+# rspec-rails-2.3.0
+
+## autotest integration
+
+Add a .rspec file to the project's root directory (if not already there) to
+tell RSpec to tell Autotest to use RSpec's specialized Autotest class.
+
+NOTE that rspec-core-2.0, 2.1, and 2.2 required an autotest/discover.rb file in
+the project's root directory. This worked with some, but not all versions of
+autotest and/or the autotest command that ships with ZenTest. This new approach
+will work regardless of which version of autotest/ZenTest you are using.
 
 ## Webrat and Capybara
 
@@ -51,4 +61,3 @@ to this:
     stub_model(Widget).as_new_record
 
 Generators in 2.0.0 final release will do the latter.
-

data/features/README.markdown

@@ -6,6 +6,71 @@ for requests, controllers, models, views, and helpers.
 rspec-rails-2 supports rails-3.0.0 and later. For earlier versions of Rails,
 you need [rspec-rails-1.3](http://rspec.info).
 
+## Install
+
+    gem install rspec-rails
+
+This installs the following gems:
+
+    rspec
+    rspec-core
+    rspec-expectations
+    rspec-mocks
+    rspec-rails
+
+## Configure
+
+Add rspec-rails to the :test and :development groups in the Gemfile:
+
+    group :test, :development do
+      gem "rspec-rails", "~> 2.0.1"
+    end
+
+It needs to be in the :development group to expose generators and rake tasks
+without having to type RAILS_ENV=test.
+
+Now you can run:
+
+    script/rails generate rspec:install
+
+This adds the spec directory and some skeleton files, including a .rspec
+file.
+
+## Generators
+
+If you type script/rails generate, the only RSpec generator you'll actually see
+is rspec:install. That's because RSpec is registered with Rails as the test
+framework, so whenever you generate application components like models,
+controllers, etc, RSpec specs are generated instead of Test::Unit tests.
+
+Note that the generators are there to help you get started, but they are no
+substitute for writing your own examples, and they are only guaranteed to work
+out of the box for the default scenario (ActiveRecord + Webrat).
+
+## Autotest
+
+The rspec:install generator creates a .rspec file, which tells RSpec to tell
+Autotest that you're using RSpec and Rails. You'll also need to add the ZenTest
+gem to your Gemfile:
+
+    gem "ZenTest"
+
+At this point, if all of the gems in your Gemfile are installed in system gems,
+you can just type autotest. If, however, Bundler is managing any gems for you
+directly (i.e. you've got :git or :path attributes in the Gemfile), you'll need
+to run bundle exec autotest.
+
+## Webrat and Capybara
+
+You can choose between webrat or capybara for simulating a browser, automating
+a browser, or setting expectations using the matchers they supply. Just add
+your preference to the Gemfile:
+
+    gem "webrat"
+    gem "capybara"
+
+Note that Capybara matchers are not available in view or helper specs.
+
 ## Issues
 
 The documentation for rspec-rails is a work in progress. We'll be adding
@@ -15,3 +80,4 @@ incomplete or confusing, or, better yet, wish to write a missing Cucumber
 feature yourself, please [submit an
 issue](http://github.com/rspec/rspec-rails/issues) or a [pull
 request](http://github.com/rspec/rspec-rails).
+

data/features/controller_specs/README.md

@@ -0,0 +1,25 @@
+A controller spec is an RSpec wrapper for a Rails functional test. It allows
+you to simulate a single http request in each example, and then specify
+expected outcomes, such as:
+
+* templates that are rendered by the action
+* instance variables that are assigned in the controller to be shared with
+  the view
+* cookies that get sent back with the response
+
+To specify outcomes, you can use:
+    
+* standard rspec matchers (response.code.should eq(200))
+* standard test/unit assertions (assert_equal 200, response.code)
+* rails assertions (assert_response 200)
+* rails-specific matchers:
+  * response.should render_template (wraps assert_template)
+  * response.should redirect_to (wraps assert_redirected_to)
+  * assigns(:widget).should be_a_new(Widget)
+    
+Conventions:
+
+* pass the controller being spec'd to the describe method
+  * this is only necessary for the outermost example group
+* by default, views are not rendered. See "isolation from views" and
+  "render_views" for details

data/features/controller_specs/controller_spec.feature

@@ -0,0 +1,19 @@
+Feature: controller spec
+
+
+  Scenario: simple passing example
+    Given a file named "spec/controllers/widgets_controller_spec.rb" with:
+      """
+      require "spec_helper"
+
+      describe WidgetsController do
+        describe "GET index" do
+          it "has a 200 status code" do
+            get :index
+            response.code.should eq("200")
+          end
+        end
+      end
+      """
+    When I run "rspec spec"
+    Then the example should pass

data/features/matchers/README.md

@@ -0,0 +1,4 @@
+rspec-rails offers a number of custom matchers, most of which are
+rspec-compatible wrappers for Rails' assertions.
+
+

data/features/step_definitions/rspec_steps.rb

@@ -0,0 +1,5 @@
+Then /^the example(s)? should( all)? pass$/ do |_,_|
+  Then %q{the exit status should be 0}
+  Then %q{the output should contain "0 failures"}
+end
+

data/lib/rspec/rails/mocks.rb

@@ -15,6 +15,10 @@ module RSpec
         def persisted?
           true
         end
+
+        def respond_to?(message)
+          message.to_s =~ /_before_type_cast$/ ? false : super
+        end
       end
 
       module ActiveRecordInstanceMethods

data/lib/rspec/rails/version.rb

@@ -1,7 +1,7 @@
 module RSpec # :nodoc:
   module Rails # :nodoc:
     module Version # :nodoc:
-      STRING = '2.2.1'
+      STRING = '2.3.0'
     end
   end
 end

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

@@ -144,11 +144,27 @@ describe "mock_model(RealModel)" do
         MockableModel.stub(:column_names).and_return(["column_a", "column_b"])
         @model = mock_model(MockableModel)
       end
-      it "says it will respond_to?(key) if RealModel has the attribute 'key'" do
-        @model.respond_to?("column_a").should be(true)
+      context "without as_null_object" do
+        it "says it will respond_to?(key) if RealModel has the attribute 'key'" do
+          @model.respond_to?("column_a").should be(true)
+        end
+        it "says it will not respond_to?(key) if RealModel does not have the attribute 'key'" do
+          @model.respond_to?("column_c").should be(false)
+        end
+        it "says it will not respond_to?(xxx_before_type_cast)" do
+          @model.respond_to?("title_before_type_cast").should be(false)
+        end
       end
-      it "does not say it will respond_to?(key) if RealModel does not have the attribute 'key'" do
-        @model.respond_to?("column_c").should be(false)
+      context "with as_null_object" do
+        it "says it will respond_to?(key) if RealModel has the attribute 'key'" do
+          @model.as_null_object.respond_to?("column_a").should be(true)
+        end
+        it "says it will respond_to?(key) even if RealModel does not have the attribute 'key'" do
+          @model.as_null_object.respond_to?("column_c").should be(true)
+        end
+        it "says it will not respond_to?(xxx_before_type_cast)" do
+          @model.as_null_object.respond_to?("title_before_type_cast").should be(false)
+        end
       end
     end
 
@@ -157,6 +173,12 @@ describe "mock_model(RealModel)" do
         model = NonActiveRecordModel.new
         model.should respond_to(:to_param)
       end
+      context "with as_null_object" do
+        it "says it will not respond_to?(xxx_before_type_cast)" do
+          model = NonActiveRecordModel.new.as_null_object
+          model.respond_to?("title_before_type_cast").should be(false)
+        end
+      end
     end
   end
 

data/templates/generate_stuff.rb

@@ -7,7 +7,7 @@ generate('model thing name:string')
 generate('helper things')
 generate('scaffold widget name:string category:string instock:boolean')
 generate('observer widget')
-generate('scaffold gadget ') # scaffold with no attributes
+generate('scaffold gadget') # scaffold with no attributes
 
 run('rake db:migrate')
 run('rake db:test:prepare')

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-rails
 version: !ruby/object:Gem::Version 
+  hash: 3
   prerelease: false
   segments: 
   - 2
-  - 2
-  - 1
-  version: 2.2.1
+  - 3
+  - 0
+  version: 2.3.0
 platform: ruby
 authors: 
 - David Chelimsky
@@ -14,64 +15,68 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-01 00:00:00 -06:00
+date: 2010-12-12 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: activesupport
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 3
         - 0
         version: "3.0"
   type: :runtime
+  name: activesupport
   prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: actionpack
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 3
         - 0
         version: "3.0"
   type: :runtime
+  name: actionpack
   prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: railties
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 3
         - 0
         version: "3.0"
   type: :runtime
+  name: railties
   prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rspec
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 2
-        - 2
+        - 3
         - 0
-        version: 2.2.0
+        version: 2.3.0
   type: :runtime
+  name: rspec
   prerelease: false
   version_requirements: *id004
 description: RSpec-2 for Rails-3
@@ -92,15 +97,16 @@ files:
 - Rakefile
 - Thorfile
 - Upgrade.markdown
-- autotest/discover.rb
 - cucumber.yml
 - features/README.markdown
+- features/controller_specs/README.md
 - features/controller_specs/anonymous_controller.feature
+- features/controller_specs/controller_spec.feature
 - 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/README.md
 - features/matchers/be_routable_matcher.feature
 - features/matchers/new_record_matcher.feature
 - features/matchers/redirect_to_matcher.feature
@@ -111,6 +117,7 @@ files:
 - features/model_specs/transactional_examples.feature
 - features/routing_specs/access_to_named_routes.feature
 - features/step_definitions/model_steps.rb
+- features/step_definitions/rspec_steps.rb
 - features/support/env.rb
 - features/view_specs/inferred_controller_path.feature
 - features/view_specs/stub_template.feature
@@ -124,7 +131,6 @@ files:
 - lib/generators/rspec/helper/templates/helper_spec.rb
 - lib/generators/rspec/install/install_generator.rb
 - lib/generators/rspec/install/templates/.rspec
-- lib/generators/rspec/install/templates/autotest/discover.rb
 - lib/generators/rspec/install/templates/spec/spec_helper.rb
 - lib/generators/rspec/integration/integration_generator.rb
 - lib/generators/rspec/integration/templates/request_spec.rb
@@ -211,7 +217,7 @@ licenses: []
 post_install_message: |
   **************************************************
   
-    Thank you for installing rspec-rails-2.2.1!
+    Thank you for installing rspec-rails-2.3.0!
   
     This version of rspec-rails only works with versions of rails >= 3.0.0
   
@@ -221,7 +227,7 @@ post_install_message: |
     can access its generators and rake tasks.
   
       group :development, :test do
-        gem "rspec-rails", ">= 2.2.1"
+        gem "rspec-rails", ">= 2.3.0"
       end
   
     Be sure to run the following command in each of your Rails apps if you're
@@ -252,7 +258,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1117426161329304162
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -261,7 +267,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1117426161329304162
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -271,15 +277,17 @@ rubyforge_project: rspec
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: rspec-rails-2.2.1
+summary: rspec-rails-2.3.0
 test_files: 
 - features/README.markdown
+- features/controller_specs/README.md
 - features/controller_specs/anonymous_controller.feature
+- features/controller_specs/controller_spec.feature
 - 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/README.md
 - features/matchers/be_routable_matcher.feature
 - features/matchers/new_record_matcher.feature
 - features/matchers/redirect_to_matcher.feature
@@ -290,6 +298,7 @@ test_files:
 - features/model_specs/transactional_examples.feature
 - features/routing_specs/access_to_named_routes.feature
 - features/step_definitions/model_steps.rb
+- features/step_definitions/rspec_steps.rb
 - features/support/env.rb
 - features/view_specs/inferred_controller_path.feature
 - features/view_specs/stub_template.feature

data/autotest/discover.rb

@@ -1 +0,0 @@
-Autotest.add_discovery { "rspec2" }

data/features/controller_specs/readers.feature

@@ -1,18 +0,0 @@
-Feature: controller spec readers
-
-  Controller specs expose a number of different
-  attribute readers.
-
-  Scenario: access controller
-    Given a file named "spec/controllers/widgets_controller_spec.rb" with:
-      """
-      require "spec_helper"
-
-      describe WidgetsController do
-        it "is available before an action" do
-          controller.should be_an_instance_of(WidgetsController)
-        end
-      end
-      """
-    When I run "rspec ./spec"
-    Then the output should contain "1 example, 0 failures"

data/lib/generators/rspec/install/templates/autotest/discover.rb

@@ -1,2 +0,0 @@
-Autotest.add_discovery { "rails" }
-Autotest.add_discovery { "rspec2" }