Update to rspec-rails 2.0 pre-release.

Older rspec-rails versions don't support Rails 3.
capacitive · Sep 11, 2010 · 5e26c29 · 5e26c29
1 parent b7a2183
commit 5e26c29
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 186 deletions.
diff --git a/.rspec b/.rspec
@@ -0,0 +1 @@
+--colour
diff --git a/Gemfile b/Gemfile
@@ -15,10 +15,10 @@ gem 'flickr', '~> 1.0.2'
 gem 'rubypants', '~> 0.2.0'
 gem 'rails-app-installer', '~> 0.2.0'
 
-group :test do
+group :development, :test do
   gem 'ruby-debug'
   gem 'factory_girl'
-  gem 'rspec'
-  gem 'rspec-rails'
-  gem 'flexmock'
+  #gem 'rspec'
+  gem 'rspec-rails', '>= 2.0.0.beta.20'
+  #gem 'flexmock'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -39,11 +39,11 @@ GEM
     coderay (0.9.3)
     columnize (0.3.1)
     daemons (1.1.0)
+    diff-lcs (1.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
     factory_girl (1.3.2)
     fastthread (1.0.7)
-    flexmock (0.8.7)
     flickr (1.0.2)
       xml-simple (>= 1.0.7)
     gem_plugin (0.2.3)
@@ -90,10 +90,16 @@ GEM
       rake (>= 0.8.4)
       thor (~> 0.14.0)
     rake (0.8.7)
-    rspec (1.3.0)
-    rspec-rails (1.3.2)
-      rack (>= 1.0.0)
-      rspec (>= 1.3.0)
+    rspec (2.0.0.beta.20)
+      rspec-core (= 2.0.0.beta.20)
+      rspec-expectations (= 2.0.0.beta.20)
+      rspec-mocks (= 2.0.0.beta.20)
+    rspec-core (2.0.0.beta.20)
+    rspec-expectations (2.0.0.beta.20)
+      diff-lcs (>= 1.1.2)
+    rspec-mocks (2.0.0.beta.20)
+    rspec-rails (2.0.0.beta.20)
+      rspec (= 2.0.0.beta.20)
     ruby-debug (0.10.3)
       columnize (>= 0.1)
       ruby-debug-base (~> 0.10.3.0)
@@ -120,15 +126,13 @@ DEPENDENCIES
   calendar_date_select
   coderay (~> 0.9)
   factory_girl
-  flexmock
   flickr (~> 1.0.2)
   htmlentities
   json
   mini_magick (~> 1.3)
   rails (= 3.0.0)
   rails-app-installer (~> 0.2.0)
-  rspec
-  rspec-rails
+  rspec-rails (>= 2.0.0.beta.20)
   ruby-debug
   rubypants (~> 0.2.0)
   uuidtools (~> 2.1.1)

diff --git a/autotest/discover.rb b/autotest/discover.rb
@@ -0,0 +1,2 @@
+Autotest.add_discovery { "rails" }
+Autotest.add_discovery { "rspec2" }
diff --git a/lib/tasks/rspec.rake b/lib/tasks/rspec.rake
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -1,14 +1,17 @@
-# This file is copied to ~/spec when you run 'ruby script/generate rspec'
-# from the project root directory.
+# This file is copied to spec/ when you run 'rails generate rspec:install'
 ENV["RAILS_ENV"] ||= 'test'
-require File.dirname(__FILE__) + "/../config/environment" unless defined?(RAILS_ROOT)
-require 'spec/autorun'
-require 'spec/rails'
+require File.expand_path("../../config/environment", __FILE__)
+require 'rspec/rails'
 
-Spec::Runner.configure do |config|
+# Requires supporting ruby files with custom matchers and macros, etc,
+# in spec/support/ and its subdirectories.
+Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
+
+RSpec.configure do |config|
+  config.mock_with :rspec
   config.use_transactional_fixtures = true
   config.use_instantiated_fixtures  = false
-  config.fixture_path = RAILS_ROOT + '/test/fixtures/'
+  config.fixture_path = "#{::Rails.root}/test/fixtures"
   config.global_fixtures =
     %w{ blogs categories categorizations contents
         feedback notifications page_caches profiles redirects resources sidebars
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		Autotest.add_discovery { "rails" }
		Autotest.add_discovery { "rspec2" }