Skip to content
This repository has been archived by the owner on Aug 10, 2020. It is now read-only.

Commit

Permalink
Upgraded rspec, now runs after bundle instal.
Browse files Browse the repository at this point in the history
  • Loading branch information
dblock committed Jun 29, 2011
1 parent 7108683 commit d6ddd7e
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 10 deletions.
2 changes: 2 additions & 0 deletions .rspec
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
--colour

12 changes: 8 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
source :rubygems

group :development do
group :development, :test do
gem 'rails', '~> 2.3'
gem 'jeweler'
gem 'rspec', '1.3'
gem 'rspec', '~> 2.6.0'
gem 'rspec-core', '~> 2.6.4'
gem 'rspec-expectations', '~> 2.6.0'
gem 'rspec-mocks', '~> 2.6.0'
gem 'diff-lcs'
gem 'rails', '~> 2.3'
gem 'guard'
gem 'guard-rspec'
gem 'rb-fsevent'
gem 'growl'
end
end

14 changes: 12 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,14 @@ GEM
rake (>= 0.8.3)
rake (0.8.7)
rb-fsevent (0.4.0)
rspec (1.3.0)
rspec (2.6.0)
rspec-core (~> 2.6.0)
rspec-expectations (~> 2.6.0)
rspec-mocks (~> 2.6.0)
rspec-core (2.6.4)
rspec-expectations (2.6.0)
diff-lcs (~> 1.1.2)
rspec-mocks (2.6.0)
thor (0.14.6)

PLATFORMS
Expand All @@ -53,4 +60,7 @@ DEPENDENCIES
jeweler
rails (~> 2.3)
rb-fsevent
rspec (= 1.3)
rspec (~> 2.6.0)
rspec-core (~> 2.6.4)
rspec-expectations (~> 2.6.0)
rspec-mocks (~> 2.6.0)
2 changes: 1 addition & 1 deletion spec/analytical_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class DummyForInit
extend Analytical
def self.helper_method(*a); end
def request
Spec::Mocks::Mock.new 'request',
RSpec::Mocks::Mock.new 'request',
:'ssl?'=>true,
:user_agent=>'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.6; en-US; rv:1.9.2.3) Gecko/20100401 Firefox/3.6.3 GTB7.0'
end
Expand Down
9 changes: 6 additions & 3 deletions spec/spec_helper.rb
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
$LOAD_PATH.unshift(File.dirname(__FILE__))
$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))

require 'rubygems'

require 'active_support'
require 'active_support/core_ext'
require 'active_support/json'
require 'action_view'
require 'spec'
require 'spec/autorun'

require 'analytical'

Spec::Runner.configure do |config|
RSpec.configure do |config|
config.mock_with :rspec
config.expect_with :rspec
end

module Rails
Expand Down

0 comments on commit d6ddd7e

Please sign in to comment.