Skip to content

Commit

Permalink
Initial tweaks for our environment
Browse files Browse the repository at this point in the history 
Switched specs to load stuff from bundler
Update to rspec 2.8.x
Make mocking framework detection work with updated rspec
  • Loading branch information
@soupmatt
soupmatt committed Feb 1, 2012
1 parent 2a3fece commit 3240eb6
Show file tree
Hide file tree
Showing 6 changed files with 66 additions and 50 deletions.
54 changes: 32 additions & 22 deletions Gemfile.lock
View file
@@ -1,44 +1,54 @@
PATH
remote: .
specs:
rspec-rails23 (0.1.0)
rspec-rails23 (0.2.0)
actionpack (~> 2.3.0)
rspec (~> 2.0.0)
rspec (~> 2.8.0)
rspec-rails23

GEM
remote: http://rubygems.org/
specs:
actionpack (2.3.10)
activesupport (= 2.3.10)
actionpack (2.3.14)
activesupport (= 2.3.14)
rack (~> 1.1.0)
activesupport (2.3.10)
diff-lcs (1.1.2)
activesupport (2.3.14)
diff-lcs (1.1.3)
git (1.2.5)
jeweler (1.5.1)
bundler (~> 1.0.0)
jeweler (1.8.3)
bundler (~> 1.0)
git (>= 1.2.5)
rake
rdoc
json (1.6.5)
mocha (0.9.9)
rake
rack (1.1.0)
rack (1.1.3)
rake (0.8.7)
rspec (2.0.1)
rspec-core (~> 2.0.1)
rspec-expectations (~> 2.0.1)
rspec-mocks (~> 2.0.1)
rspec-core (2.0.1)
rspec-expectations (2.0.1)
diff-lcs (>= 1.1.2)
rspec-mocks (2.0.1)
rspec-core (~> 2.0.1)
rspec-expectations (~> 2.0.1)
rdiscount (1.6.8)
rdoc (3.12)
json (~> 1.4)
rspec (2.8.0)
rspec-core (~> 2.8.0)
rspec-expectations (~> 2.8.0)
rspec-mocks (~> 2.8.0)
rspec-core (2.8.0)
rspec-expectations (2.8.0)
diff-lcs (~> 1.1.2)
rspec-mocks (2.8.0)
sdoc (0.3.16)
json (>= 1.1.3)
rdoc (~> 3.10)
sdoc-helpers (0.1.4)
sdoc (~> 0.2)

PLATFORMS
ruby

DEPENDENCIES
actionpack (~> 2.3.0)
jeweler (~> 1.5.1)
jeweler (~> 1.8.3)
mocha (= 0.9.9)
rspec (~> 2.0.0)
rdiscount
rspec-rails23!
sdoc
sdoc-helpers
6 changes: 4 additions & 2 deletions Rakefile
View file
Expand Up @@ -9,7 +9,10 @@ begin
s.authors = ["Rob Sanheim"]
s.files = FileList["[A-Z]*", "{bin,lib,spec}/**/*"]
s.add_dependency "actionpack", '~> 2.3.0'
s.add_dependency "rspec", '= 2.0.0.beta.8'
s.add_dependency "rspec", '~> 2.8.0'
s.add_development_dependency "sdoc"
s.add_development_dependency "sdoc-helpers"
s.add_development_dependency "rdiscount"
end
Jeweler::GemcutterTasks.new
rescue LoadError
Expand All @@ -35,7 +38,6 @@ end
task :default => [:spec]

begin
%w{sdoc sdoc-helpers rdiscount}.each { |name| gem name }
require 'sdoc_helpers'
rescue LoadError => ex
puts "sdoc support not enabled:"
Expand Down
6 changes: 3 additions & 3 deletions lib/rspec/rails23/configuration.rb
View file
Expand Up @@ -23,11 +23,11 @@ def enable_controller_support(filter_options={})
end

def enable_rails_specific_mocking_extensions(filter_options={})
case RSpec.configuration.mock_framework.to_s
when /mocha/i
case RSpec.configuration.mock_framework.framework_name
when :mocha
require 'rspec/rails23/mocking/with_mocha'
RSpec.configuration.include(::Rspec::Rails23::Mocking::WithMocha, filter_options)
when /rr/i
when :rr
require 'rspec/rails23/mocking/with_rr'
RSpec.configuration.include(::Rspec::Rails23::Mocking::WithRR, filter_options)
end
Expand Down
42 changes: 23 additions & 19 deletions rspec-rails23.gemspec
View file
Expand Up @@ -9,7 +9,7 @@ Gem::Specification.new do |s|

s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
s.authors = ["Rob Sanheim"]
s.date = %q{2010-11-27}
s.date = %q{2012-02-01}
s.description = %q{Rails 2.3.5 Extension for Rspec 2}
s.email = %q{rsanheim@gmail.com}
s.extra_rdoc_files = [
Expand Down Expand Up @@ -41,42 +41,46 @@ Gem::Specification.new do |s|
]
s.homepage = %q{http://github.com/rsanheim/rspec-rails23}
s.require_paths = ["lib"]
s.rubygems_version = %q{1.3.7}
s.rubygems_version = %q{1.5.2}
s.summary = %q{Rspec Rails for 2.3.5}
s.test_files = [
"spec/lib/rspec/rails23/configuration_spec.rb",
"spec/spec_helper.rb"
]

if s.respond_to? :specification_version then
current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
s.specification_version = 3

if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
s.add_runtime_dependency(%q<rspec-rails23>, [">= 0"])
s.add_runtime_dependency(%q<actionpack>, ["~> 2.3.0"])
s.add_runtime_dependency(%q<rspec>, ["~> 2.0.0"])
s.add_development_dependency(%q<jeweler>, ["~> 1.5.1"])
s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
s.add_development_dependency(%q<mocha>, ["= 0.9.9"])
s.add_development_dependency(%q<sdoc>, [">= 0"])
s.add_development_dependency(%q<rdiscount>, [">= 0"])
s.add_runtime_dependency(%q<actionpack>, ["~> 2.3.0"])
s.add_runtime_dependency(%q<rspec>, ["= 2.0.0.beta.8"])
s.add_runtime_dependency(%q<rspec>, ["~> 2.8.0"])
s.add_development_dependency(%q<sdoc>, [">= 0"])
s.add_development_dependency(%q<sdoc-helpers>, [">= 0"])
s.add_development_dependency(%q<rdiscount>, [">= 0"])
else
s.add_dependency(%q<rspec-rails23>, [">= 0"])
s.add_dependency(%q<actionpack>, ["~> 2.3.0"])
s.add_dependency(%q<rspec>, ["~> 2.0.0"])
s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
s.add_dependency(%q<mocha>, ["= 0.9.9"])
s.add_dependency(%q<sdoc>, [">= 0"])
s.add_dependency(%q<rdiscount>, [">= 0"])
s.add_dependency(%q<actionpack>, ["~> 2.3.0"])
s.add_dependency(%q<rspec>, ["= 2.0.0.beta.8"])
s.add_dependency(%q<rspec>, ["~> 2.8.0"])
s.add_dependency(%q<sdoc>, [">= 0"])
s.add_dependency(%q<sdoc-helpers>, [">= 0"])
s.add_dependency(%q<rdiscount>, [">= 0"])
end
else
s.add_dependency(%q<rspec-rails23>, [">= 0"])
s.add_dependency(%q<actionpack>, ["~> 2.3.0"])
s.add_dependency(%q<rspec>, ["~> 2.0.0"])
s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
s.add_dependency(%q<mocha>, ["= 0.9.9"])
s.add_dependency(%q<sdoc>, [">= 0"])
s.add_dependency(%q<rdiscount>, [">= 0"])
s.add_dependency(%q<actionpack>, ["~> 2.3.0"])
s.add_dependency(%q<rspec>, ["= 2.0.0.beta.8"])
s.add_dependency(%q<rspec>, ["~> 2.8.0"])
s.add_dependency(%q<sdoc>, [">= 0"])
s.add_dependency(%q<sdoc-helpers>, [">= 0"])
s.add_dependency(%q<rdiscount>, [">= 0"])
end
end

2 changes: 1 addition & 1 deletion spec/lib/rspec/rails23/configuration_spec.rb
View file
Expand Up @@ -33,7 +33,7 @@
end

example "#enable_Rails23_specific_mocking_extensions for mocha with no filter options" do
RSpec.configuration.mock_with :mocha
RSpec.configuration.mock_framework = :mocha
RSpec.configuration.enable_rails_specific_mocking_extensions
RSpec.configuration.include_or_extend_modules.should include([:include, Rspec::Rails23::Mocking::WithMocha, {}])
end
Expand Down
6 changes: 3 additions & 3 deletions spec/spec_helper.rb
View file
Expand Up @@ -2,15 +2,15 @@
$LOAD_PATH.unshift lib_path unless $LOAD_PATH.include?(lib_path)

require 'rubygems'
gem "actionpack", '~> 2.3'
require 'bundler/setup'

require 'action_controller'

gem "rspec-core", "~> 2.0.0.beta"
require 'rspec/core'
require 'rspec/core/formatters/base_text_formatter'
require 'rspec-rails23'

gem "mocha"
#gem "mocha"

module Rspec
module Core
Expand Down

0 comments on commit 3240eb6

Please sign in to comment.