rspec-rails 2.0.0.beta.6 → 2.0.0.beta.7

data/.gitignore

@@ -1,2 +1,4 @@
 tmp
 pkg
+.bundle
+rspec-rails-

data/Gemfile

@@ -0,0 +1,8 @@
+source "http://rubygems.org"
+gem 'rails', :path => "./tmp/rails"
+gem 'rspec', '>= 2.0.0.beta'
+gem 'cucumber'
+gem 'aruba'
+gem 'jeweler'
+gem 'webrat'
+

data/Rakefile

@@ -77,7 +77,7 @@ namespace :generate do
   desc "generate a fresh app with rspec installed"
   task :app => ["rails:clone"] do |t|
     unless File.directory?('./tmp/example_app')
-      ruby "./tmp/rails/railties/bin/rails tmp/example_app --dev -m example_app_template.rb"
+      ruby "./tmp/rails/bin/rails tmp/example_app --dev -m example_app_template.rb"
     end
   end
 
@@ -124,5 +124,11 @@ namespace :clobber do
   end
 end
 
-task :default => ["clobber:app", "generate:app", "generate:stuff", :spec, :cucumber, :smoke]
+namespace :bundle do
+  task :install do
+    sh "bundle install"
+  end
+end
+
+task :default => ["bundle:install", "clobber:app", "generate:app", "generate:stuff", :spec, :cucumber, :smoke]
 

data/VERSION

@@ -1 +1 @@
-2.0.0.beta.6
+2.0.0.beta.7

data/lib/rspec/rails/example/controller_example_group.rb

@@ -1,3 +1,5 @@
+require 'active_support/core_ext/class/attribute_accessors'
+require 'action_controller'
 require 'action_dispatch'
 require 'webrat'
 

data/lib/rspec/rails/example/view_example_group.rb

@@ -10,11 +10,11 @@ module ViewExampleGroupBehaviour
 
   module ViewExtension
     def protect_against_forgery?; end
-    def method_missing(selector, *args)
-      if Rails.application.routes.named_routes.helpers.include?(selector)
-        controller.__send__(selector, *args)
+    def method_missing(name, *args)
+      if controller.respond_to?(name) || Rails.application.routes.named_routes.helpers.include?(name)
+        controller.__send__(name, *args)
       else
-        super
+        super(name, *args)
       end
     end
   end

data/lib/rspec/rails/matchers.rb

@@ -11,6 +11,12 @@ rescue LoadError
   end
 end
 
+begin
+  require "active_record"
+rescue
+
+end
+
 Rspec::Matchers.define :redirect_to do |destination|
   match_unless_raises Test::Unit::AssertionFailedError do |_|
     assert_redirected_to destination

data/lib/rspec/rails/mocks.rb

@@ -16,7 +16,7 @@ module Rspec
           :new_record? => false,
           :destroyed? => false,
           :marked_for_destruction? => false,
-          :errors => stub("errors", :count => 0)
+          :errors => stub("errors", :count => 0, :any? => false)
         })
         derived_name = "#{model_class.name}_#{id}"
         m = mock(derived_name, options_and_stubs)

data/rspec-rails.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rspec-rails}
-  s.version = "2.0.0.beta.6"
+  s.version = "2.0.0.beta.7"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Chelimsky", "Chad Humphries"]
-  s.date = %q{2010-04-12}
+  s.date = %q{2010-04-17}
   s.description = %q{Rspec-2 for Rails-3}
   s.email = %q{dchelimsky@gmail.com;chad.humphries@gmail.com}
   s.extra_rdoc_files = [
@@ -17,6 +17,7 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".gitignore",
+     "Gemfile",
      "README.markdown",
      "Rakefile",
      "VERSION",
@@ -83,7 +84,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/rspec/rspec-rails}
   s.post_install_message = %q{**************************************************
 
-  Thank you for installing rspec-rails-2.0.0.beta.6!
+  Thank you for installing rspec-rails-2.0.0.beta.7!
 
   This version of rspec-rails only works with 
   versions of rails >= 3.0.0.pre.
@@ -98,7 +99,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{rspec}
   s.rubygems_version = %q{1.3.6}
-  s.summary = %q{rspec-rails-2.0.0.beta.6}
+  s.summary = %q{rspec-rails-2.0.0.beta.7}
   s.test_files = [
     "spec/rspec/rails/matchers/be_a_new_spec.rb",
      "spec/rspec/rails/matchers/redirect_to_spec.rb",
@@ -115,14 +116,14 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rspec>, ["= 2.0.0.beta.6"])
+      s.add_runtime_dependency(%q<rspec>, ["= 2.0.0.beta.7"])
       s.add_runtime_dependency(%q<webrat>, [">= 0.7.0"])
     else
-      s.add_dependency(%q<rspec>, ["= 2.0.0.beta.6"])
+      s.add_dependency(%q<rspec>, ["= 2.0.0.beta.7"])
       s.add_dependency(%q<webrat>, [">= 0.7.0"])
     end
   else
-    s.add_dependency(%q<rspec>, ["= 2.0.0.beta.6"])
+    s.add_dependency(%q<rspec>, ["= 2.0.0.beta.7"])
     s.add_dependency(%q<webrat>, [">= 0.7.0"])
   end
 end

data/spec/spec_helper.rb

@@ -1,16 +1,6 @@
-%w(actionmailer actionpack activemodel activerecord activeresource activesupport railties).each do |directory|
-  $LOAD_PATH.unshift File.expand_path( File.join(File.dirname(__FILE__), "..", "tmp", "rails", directory, "lib") )
-end
+require 'bundler'
+Bundler.setup
 
-require 'i18n'
-require 'rack'
-require 'rack/mock'
-require 'rack/mime'
-require 'active_support'
-require 'active_support/core_ext'
-require 'action_dispatch'
-require 'action_controller'
-require 'active_record'
 require 'rspec/rails'
 
 def in_editor?

metadata

@@ -7,8 +7,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 0
   - beta
-  - 6
-  version: 2.0.0.beta.6
+  - 7
+  version: 2.0.0.beta.7
 platform: ruby
 authors: 
 - David Chelimsky
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-12 00:00:00 -05:00
+date: 2010-04-17 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,8 +32,8 @@ dependencies:
         - 0
         - 0
         - beta
-        - 6
-        version: 2.0.0.beta.6
+        - 7
+        version: 2.0.0.beta.7
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -60,6 +60,7 @@ extra_rdoc_files:
 - README.markdown
 files: 
 - .gitignore
+- Gemfile
 - README.markdown
 - Rakefile
 - VERSION
@@ -129,7 +130,7 @@ licenses: []
 post_install_message: |
   **************************************************
   
-    Thank you for installing rspec-rails-2.0.0.beta.6!
+    Thank you for installing rspec-rails-2.0.0.beta.7!
   
     This version of rspec-rails only works with 
     versions of rails >= 3.0.0.pre.
@@ -166,7 +167,7 @@ rubyforge_project: rspec
 rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: rspec-rails-2.0.0.beta.6
+summary: rspec-rails-2.0.0.beta.7
 test_files: 
 - spec/rspec/rails/matchers/be_a_new_spec.rb
 - spec/rspec/rails/matchers/redirect_to_spec.rb