rspec-rails 2.0.1 → 2.1.0

data/Gemfile

@@ -1,24 +1,23 @@
 source "http://rubygems.org"
 
-gem 'arel', :path => "./vendor/arel"
-gem 'rails', :path => "./vendor/rails"
+gem "rack", :git => "git://github.com/rack/rack.git"
+gem 'rails', :path => File.expand_path("../vendor/rails", __FILE__)
 
-gem 'rspec-rails', :path => "."
-gem 'rspec-core', :path => "../rspec-core"
-gem 'rspec-expectations', :path => "../rspec-expectations"
-gem 'rspec-mocks', :path => "../rspec-mocks"
-gem 'rspec', :path => "../rspec"
+%w[rspec-rails rspec rspec-core rspec-expectations rspec-mocks].each do |lib|
+  gem lib, :path => File.expand_path("../../#{lib}", __FILE__)
+end
 
-gem 'cucumber', '~> 0.9.2'
-gem 'aruba', "~> 0.2.3", :require => nil
-gem 'webrat', ">= 0.7.2.beta.1"
+gem "cucumber", "0.8.5"
+gem "aruba", "0.2.2"
+gem 'webrat', "0.7.2"
 gem 'sqlite3-ruby', :require => 'sqlite3'
 
 gem 'autotest'
 
-case RUBY_VERSION
-when /^1\.9/
+platforms :mri_19 do
   gem 'ruby-debug19'
-when /^1\.8/
+end
+
+platforms :mri_18 do
   gem 'ruby-debug'
 end

data/History.md

@@ -1,5 +1,16 @@
 ## rspec-rails-2 release history (incomplete)
 
+### 2.1.0 / 2010-11-07
+
+[full changelog](http://github.com/rspec/rspec-rails/compare/v2.0.1...v2.1.0)
+
+* Enhancements
+  * Move errors_on to ActiveModel to support other AM-compliant ORMs
+
+* Bug fixes
+  * Check for presence of ActiveRecord instead of checking Rails config
+    (gets rspec out of the way of multiple ORMs in the same app)
+
 ### 2.0.1 / 2010-10-15
 
 [full changelog](http://github.com/rspec/rspec-rails/compare/v2.0.0...v2.0.1)

data/README.markdown

@@ -2,9 +2,16 @@
 
 rspec-2 for rails-3 with lightweight extensions to each
 
+NOTE: rspec-2 does _not_ support rails-2. Use rspec-rails-1.3.x for rails-2.
+
+## Documentation
+
+* [Cucumber features](http://relishapp.com/rspec/rspec-rails/v/2-0)
+* [RDoc](http://rubydoc.info/gems/rspec-rails/2.0.1/frames)
+
 ## Install
 
-    gem install rspec-rails --pre
+    gem install rspec-rails
 
 This installs the following gems:
 
@@ -19,7 +26,7 @@ This installs the following gems:
 Add `rspec-rails` to the `:test` and `:development` groups in the Gemfile:
 
     group :test, :development do
-      gem "rspec-rails", ">= 2.0.0.beta.22"
+      gem "rspec-rails", "~> 2.0.1"
     end
 
 It needs to be in the `:development` group to expose generators and rake
@@ -99,8 +106,6 @@ not send you to the doctor with a migraine.
 
 See http://github.com/rspec/rspec-rails/issues
 
-Also see [Gotchas.markdown](http://github.com/rspec/rspec-rails/blob/master/Gotchas.markdown)
-
 # Request Specs
 
 Request specs live in spec/requests.

data/Rakefile

@@ -1,9 +1,8 @@
-unless File.directory?("vendor/rails") && File.directory?("vendor/arel")
+unless File.directory?("vendor/rails")
   raise <<-MESSAGE
-You need to clone the rails and arel git repositories into ./vendor
-before you can use any of the rake tasks.
+You need to clone the rails git repository into ./vendor before you can use any
+of the rake tasks.
 
-    git clone git://github.com/rails/arel.git  vendor/arel
     git clone git://github.com/rails/rails.git vendor/rails
 
 MESSAGE
@@ -20,14 +19,6 @@ require 'rspec'
 require 'rspec/core/rake_task'
 require 'cucumber/rake/task'
 
-class Cucumber::Rake::Task::ForkedCucumberRunner
-  # When cucumber shells out, we still need it to run in the context of our
-  # bundle.
-  def run
-    sh "bundle exec #{RUBY} " + args.join(" ")
-  end
-end
-
 task :cleanup_rcov_files do
   rm_rf 'coverage.data'
 end
@@ -70,33 +61,34 @@ namespace :generate do
 
   desc "generate a bunch of stuff with generators"
   task :stuff do
-    Dir.chdir("./tmp/example_app/") do
-      sh "rake rails:template LOCATION='../../templates/generate_stuff.rb'"
+    in_example_app "bundle install"
+    in_example_app "rake rails:template LOCATION='../../templates/generate_stuff.rb'"
+  end
+end
+
+def in_example_app(command)
+  Dir.chdir("./tmp/example_app/") do
+    Bundler.with_clean_env do
+      sh command
     end
   end
 end
 
 namespace :db do
   task :migrate do
-    Dir.chdir("./tmp/example_app/") do
-      sh "rake db:migrate"
-    end
+    in_example_app "rake db:migrate"
   end
 
   namespace :test do
     task :prepare do
-      Dir.chdir("./tmp/example_app/") do
-        sh "rake db:test:prepare"
-      end
+      in_example_app "rake db:test:prepare"
     end
   end
 end
 
 desc "run a variety of specs against the generated app"
 task :smoke do
-  Dir.chdir("./tmp/example_app/") do
-    sh "rake rails:template LOCATION='../../templates/run_specs.rb'"
-  end
+  in_example_app "rake rails:template --trace LOCATION='../../templates/run_specs.rb'"
 end
 
 desc 'clobber generated files'
@@ -121,3 +113,4 @@ end
 
 task :default => [:spec, "clobber:app", "generate:app", "generate:stuff", :smoke, :cucumber]
 
+

data/Thorfile

@@ -1,43 +1,18 @@
 class Rails < Thor
-  VERSIONS = {
-    :rails => {
-      "master" => "master",
-      "3.0.0" => "v3.0.0",
-      "3.0.1" => "v3.0.1",
-      "3-0-stable" => "origin/3-0-stable"
-    },
-    :arel => {
-      "master" => "master",
-      "3.0.0" => "v1.0.0",
-      "3.0.1" => "v1.0.0",
-      "3-0-stable" => "master"
-    }
-  }
-
-  desc "checkout VERSION", "checks it out (and arel)"
+  desc "checkout VERSION", "checks it out"
   def checkout(version)
-    unless VERSIONS[:rails].has_key?(version)
-      raise "\n#{"*"*50}\nvalid versions are: #{VERSIONS[:rails].keys.join(", ")}\n#{"*"*50}\n"
-    end
-
-    puts "***** checking out rails at #{VERSIONS[:rails][version]} ..."
+    puts "***** checking out rails at #{version} ..."
     Dir.chdir("vendor/rails") do
-      `git checkout #{VERSIONS[:rails][version]}`
-    end
-
-    puts "***** checking out arel at #{VERSIONS[:arel][version]} ..."
-    Dir.chdir("vendor/arel") do
-      `git checkout #{VERSIONS[:arel][version]}`
+      `git checkout #{version}`
+      `rm Gemfile.lock` if File.exist?('Gemfile.lock')
+      puts `bundle show`
     end
   end
 
-  desc "fetch", "update vendor/rails and vendor/arel"
+  desc "fetch", "update vendor/rails"
   def fetch
     Dir.chdir("vendor/rails") do
       `git fetch`
     end
-    Dir.chdir("vendor/arel") do
-      `git fetch`
-    end
   end
 end

data/features/support/env.rb

@@ -1,6 +1,22 @@
 require 'aruba'
 require 'webrat'
 
+module Aruba::Api
+  alias_method :orig_run, :run
+
+  def run(cmd, fail_on_error=false)
+    if cmd =~ /^rspec/
+      orig_run("bundle exec #{cmd}", fail_on_error)
+    else
+      orig_run(cmd, fail_on_error)
+    end
+  end
+end
+
+Before do
+  unset_bundler_env_vars
+end
+
 unless File.directory?('./tmp/example_app')
   system "rake generate:app generate:stuff"
 end
@@ -25,15 +41,14 @@ def copy(file_or_dir)
   system "cp -r #{source} #{target}"
 end
 
+
 Before do
   steps %Q{
     Given a directory named "spec"
   }
 
   Dir['tmp/example_app/*'].each do |file_or_dir|
-    if file_or_dir =~ /Gemfile/
-      copy(file_or_dir)
-    elsif !(file_or_dir =~ /spec$/)
+    if !(file_or_dir =~ /spec$/)
       write_symlink(file_or_dir)
     end
   end
@@ -43,3 +58,8 @@ Before do
   end
 
 end
+
+Around do |scenario, block|
+  Bundler.with_clean_env &block
+end
+

data/lib/rspec/rails.rb

@@ -1,13 +1,3 @@
-module RSpec
-  module Rails
-    class << self
-      def using_active_record?
-        ::Rails.configuration.generators.options[:rails][:orm] == :active_record
-      end
-    end
-  end
-end
-
 require 'rspec/core'
 
 RSpec::configure do |c|

data/lib/rspec/rails/extensions/active_record/base.rb

@@ -1,44 +1,40 @@
 module RSpec
   module Rails
-    if using_active_record?
+    if defined?(ActiveRecord)
       module Extensions
         module ActiveRecord
-          module ClassMethods
-            # :call-seq:
-            #   ModelClass.should have(:no).records
-            #   ModelClass.should have(1).record
-            #   ModelClass.should have(n).records
-            #
-            # Extension to enhance <tt>should have</tt> on AR Model classes
-            def records
-              find(:all)
-            end
-            alias :record :records
-          end
-
-          module InstanceMethods
-            # :call-seq:
-            #   model.should have(:no).errors_on(:attribute)
-            #   model.should have(1).error_on(:attribute)
-            #   model.should have(n).errors_on(:attribute)
-            #
-            # Extension to enhance <tt>should have</tt> on AR Model instances.
-            # Calls model.valid? in order to prepare the object's errors
-            # object.
-            def errors_on(attribute)
-              self.valid?
-              [self.errors[attribute]].flatten.compact
-            end
-            alias :error_on :errors_on
+          # :call-seq:
+          #   ModelClass.should have(:no).records
+          #   ModelClass.should have(1).record
+          #   ModelClass.should have(n).records
+          #
+          # Extension to enhance <tt>should have</tt> on AR Model classes
+          def records
+            find(:all)
           end
+          alias :record :records
         end
-      end
 
-      class ::ActiveRecord::Base #:nodoc:
-        extend  RSpec::Rails::Extensions::ActiveRecord::ClassMethods
-        include RSpec::Rails::Extensions::ActiveRecord::InstanceMethods
+        class ::ActiveRecord::Base #:nodoc:
+          extend RSpec::Rails::Extensions::ActiveRecord
+        end
       end
     end
   end
 end
 
+module ::ActiveModel::Validations
+  # :call-seq:
+  #   model.should have(:no).errors_on(:attribute)
+  #   model.should have(1).error_on(:attribute)
+  #   model.should have(n).errors_on(:attribute)
+  #
+  # Extension to enhance <tt>should have</tt> on AR Model instances.
+  # Calls model.valid? in order to prepare the object's errors
+  # object.
+  def errors_on(attribute)
+    self.valid?
+    [self.errors[attribute]].flatten.compact
+  end
+  alias :error_on :errors_on
+end

data/lib/rspec/rails/fixture_support.rb

@@ -1,6 +1,6 @@
 module RSpec
   module Rails
-    if using_active_record?
+    if defined?(ActiveRecord)
       module FixtureSupport
         extend ActiveSupport::Concern
 

data/lib/rspec/rails/matchers.rb

@@ -1,5 +1,4 @@
 require 'rspec/core/deprecation'
-require 'rspec/core/backward_compatibility'
 require 'rspec/matchers'
 
 module RSpec::Rails

data/lib/rspec/rails/mocks.rb

@@ -70,7 +70,7 @@ EOM
           m.extend ActiveModelInstanceMethods
           m.singleton_class.__send__ :include, ActiveModel::Conversion
           m.singleton_class.__send__ :include, ActiveModel::Validations
-          if RSpec::Rails::using_active_record?
+          if defined?(ActiveRecord)
             m.extend ActiveRecordInstanceMethods
             [:save, :update_attributes].each do |key|
               if stubs[key] == false
@@ -175,7 +175,7 @@ EOM
       def stub_model(model_class, stubs={})
         model_class.new.tap do |m|
           m.extend ActiveModelStubExtensions
-          if RSpec::Rails::using_active_record? && model_class < ActiveRecord::Base
+          if defined?(ActiveRecord) && model_class < ActiveRecord::Base
             m.extend ActiveRecordStubExtensions
             primary_key = model_class.primary_key.to_sym
             stubs = stubs.reverse_merge(primary_key => next_id)

data/lib/rspec/rails/version.rb

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

data/lib/rspec/rails/view_rendering.rb

@@ -15,6 +15,11 @@ module RSpec
           metadata_for_rspec_rails[:render_views] = true
         end
 
+        def integrate_views
+          RSpec.deprecate("integrate_views","render_views")
+          render_views
+        end
+
         def render_views?
           !!metadata_for_rspec_rails[:render_views]
         end

data/rspec-rails.gemspec

@@ -57,6 +57,6 @@ Gem::Specification.new do |s|
 **************************************************
 }
 
-  s.add_runtime_dependency "rspec", "~> 2.0.0"
+  s.add_runtime_dependency "rspec", "~> 2.1.0"
 end
 

data/spec/rspec/rails/deprecations_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe "rspec-rails-2 deprecations" do
+  context "controller specs" do
+    describe "::integrate_views" do
+      let(:group) do
+        RSpec::Core::ExampleGroup.describe do
+          include RSpec::Rails::ControllerExampleGroup
+        end
+      end
+
+      it "is deprecated" do
+        RSpec.should_receive(:deprecate)
+        group.integrate_views
+      end
+    end
+  end
+end

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

@@ -0,0 +1,23 @@
+require "spec_helper"
+
+describe "errors_on" do
+  let(:klass) do
+    Class.new do
+      include ActiveModel::Validations
+    end
+  end
+
+  it "calls valid?" do
+    model = klass.new
+    model.should_receive(:valid?)
+    model.errors_on(:foo)
+  end
+
+  it "returns the errors on that attribute" do
+    model = klass.new
+    model.stub(:errors) do
+      { :foo => ['a', 'b'] }
+    end
+    model.errors_on(:foo).should eq(['a','b'])
+  end
+end

data/spec/rspec/rails/extensions/active_record/records_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe "records" do
+  it "delegates to find(:all)" do
+    klass = Class.new(ActiveRecord::Base)
+    klass.should_receive(:find).with(:all)
+    klass.records
+  end
+end

data/templates/Gemfile

@@ -1,16 +1,13 @@
 source 'http://rubygems.org'
 
-gem 'arel', :path => "../../vendor/arel"
-gem 'rails', :path => "../../vendor/rails"
-
+gem "rack", :git => "git://github.com/rack/rack.git"
+gem 'rails', :path => File.expand_path("../../../vendor/rails", __FILE__)
 gem 'sqlite3-ruby', :require => 'sqlite3'
 
 group :development, :test do
-  gem "rspec-rails",        :path => "../../../rspec-rails"
-  gem "rspec",              :path => "../../../rspec"
-  gem "rspec-core",         :path => "../../../rspec-core"
-  gem "rspec-expectations", :path => "../../../rspec-expectations"
-  gem "rspec-mocks",        :path => "../../../rspec-mocks"
+  %w[rspec rspec-core rspec-expectations rspec-mocks rspec-rails].each do |lib|
+    gem lib, :path => File.expand_path("../../../../#{lib}", __FILE__)
+  end
   gem "rcov"
   gem "webrat"
   gem "autotest"

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-rails
 version: !ruby/object:Gem::Version 
-  hash: 13
   prerelease: false
   segments: 
   - 2
-  - 0
   - 1
-  version: 2.0.1
+  - 0
+  version: 2.1.0
 platform: ruby
 authors: 
 - David Chelimsky
@@ -16,25 +15,24 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-15 00:00:00 -05:00
+date: 2010-11-07 01:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  name: rspec
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
         segments: 
         - 2
+        - 1
         - 0
-        - 0
-        version: 2.0.0
-  requirement: *id001
+        version: 2.1.0
   type: :runtime
-  name: rspec
   prerelease: false
+  version_requirements: *id001
 description: RSpec-2 for Rails-3
 email: dchelimsky@gmail.com;chad.humphries@gmail.com
 executables: []
@@ -136,6 +134,7 @@ files:
 - rspec-rails.gemspec
 - spec/autotest/rails_rspec2_spec.rb
 - spec/rspec/rails/assertion_adapter_spec.rb
+- spec/rspec/rails/deprecations_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
@@ -144,6 +143,8 @@ files:
 - spec/rspec/rails/example/routing_example_group_spec.rb
 - spec/rspec/rails/example/view_example_group_spec.rb
 - spec/rspec/rails/example/view_rendering_spec.rb
+- spec/rspec/rails/extensions/active_model/errors_on_spec.rb
+- spec/rspec/rails/extensions/active_record/records_spec.rb
 - spec/rspec/rails/fixture_support_spec.rb
 - spec/rspec/rails/matchers/be_a_new_spec.rb
 - spec/rspec/rails/matchers/be_new_record_spec.rb
@@ -167,7 +168,7 @@ licenses: []
 post_install_message: |
   **************************************************
   
-    Thank you for installing rspec-rails-2.0.1!
+    Thank you for installing rspec-rails-2.1.0!
   
     This version of rspec-rails only works with versions of rails >= 3.0.0
   
@@ -177,7 +178,7 @@ post_install_message: |
     can access its generators and rake tasks.
   
       group :development, :test do
-        gem "rspec-rails", ">= 2.0.1"
+        gem "rspec-rails", ">= 2.1.0"
       end
   
     Be sure to run the following command in each of your Rails apps if you're
@@ -208,7 +209,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 101005116309468581
       segments: 
       - 0
       version: "0"
@@ -217,7 +218,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 101005116309468581
       segments: 
       - 0
       version: "0"
@@ -227,7 +228,7 @@ rubyforge_project: rspec
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: rspec-rails-2.0.1
+summary: rspec-rails-2.1.0
 test_files: 
 - features/README.markdown
 - features/controller_specs/anonymous_controller.feature
@@ -251,6 +252,7 @@ test_files:
 - features/view_specs/view_spec.feature
 - spec/autotest/rails_rspec2_spec.rb
 - spec/rspec/rails/assertion_adapter_spec.rb
+- spec/rspec/rails/deprecations_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
@@ -259,6 +261,8 @@ test_files:
 - spec/rspec/rails/example/routing_example_group_spec.rb
 - spec/rspec/rails/example/view_example_group_spec.rb
 - spec/rspec/rails/example/view_rendering_spec.rb
+- spec/rspec/rails/extensions/active_model/errors_on_spec.rb
+- spec/rspec/rails/extensions/active_record/records_spec.rb
 - spec/rspec/rails/fixture_support_spec.rb
 - spec/rspec/rails/matchers/be_a_new_spec.rb
 - spec/rspec/rails/matchers/be_new_record_spec.rb