Skip to content

Commit

Permalink
use rspec-2.0.0.a6 and bump to a7
Browse files Browse the repository at this point in the history
  • Loading branch information
dchelimsky committed Feb 15, 2010
1 parent 7a97dec commit e4cbe22
Show file tree
Hide file tree
Showing 9 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ begin
gem.email = "dchelimsky@gmail.com;chad.humphries@gmail.com"
gem.homepage = "http://github.com/rspec/rspec-rails"
gem.authors = ["David Chelimsky", "Chad Humphries"]
gem.add_dependency "rspec", ">= 2.0.0.a5"
gem.add_dependency "rspec", ">= 2.0.0.a6"
gem.add_dependency "webrat", ">= 0.7.0"
# gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
end
Expand Down
2 changes: 1 addition & 1 deletion example_app_template.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
require 'rspec/rails/version'
# This needs to be installed on the system, as well as all of its rspec-2 deps
# - would be nicer if we could source them from the <repo>/pkg dirs
gem 'rspec-rails', :version => "'#{Rspec::Rails::Version::STRING}'"
gem 'rspec-rails', :version => Rspec::Rails::Version::STRING

run('bundle install')

Expand Down
2 changes: 1 addition & 1 deletion lib/generators/rspec/install/templates/spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# in ./support/ and its subdirectories.
Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}

Rspec::Core.configure do |config|
Rspec.configure do |config|
# Remove this line if you don't want Rspec's should and should_not
# methods or matchers
require 'rspec/expectations'
Expand Down
2 changes: 1 addition & 1 deletion lib/rspec/rails/example/controller_example_group.rb
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ def #{method}(*args)
CODE
end

Rspec::Core.configure do |c|
Rspec.configure do |c|
c.include self, :example_group => { :file_path => /\bspec\/controllers\// }
end
end
2 changes: 1 addition & 1 deletion lib/rspec/rails/example/request_example_group.rb
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ def last_response
response
end

Rspec::Core.configure do |c|
Rspec.configure do |c|
c.include self, :example_group => { :file_path => /\bspec\/requests\// }
end
end
2 changes: 1 addition & 1 deletion lib/rspec/rails/mocks.rb
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,6 @@ def next_id
end
end

Rspec::Core.configure do |c|
Rspec.configure do |c|
c.include Rspec::Rails::Mocks
end
2 changes: 1 addition & 1 deletion lib/rspec/rails/transactional_database_support.rb
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ def transactional_protection_cleanup
end
end

Rspec::Core.configure do |c|
Rspec.configure do |c|
c.include Rspec::Rails::TransactionalDatabaseSupport
c.before { transactional_protection_start }
c.after { transactional_protection_cleanup }
Expand Down
2 changes: 1 addition & 1 deletion lib/rspec/rails/version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ module Version # :nodoc:
MAJOR = 2
MINOR = 0
TINY = 0
PRE = 'a6'
PRE = 'a7'

STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

Expand Down
10 changes: 5 additions & 5 deletions rspec-rails.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@

Gem::Specification.new do |s|
s.name = %q{rspec-rails}
s.version = "2.0.0.a6"
s.version = "2.0.0.a7"

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-02-08}
s.date = %q{2010-02-15}
s.email = %q{dchelimsky@gmail.com;chad.humphries@gmail.com}
s.extra_rdoc_files = [
"README.markdown"
Expand Down Expand Up @@ -72,14 +72,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.a5"])
s.add_runtime_dependency(%q<rspec>, [">= 2.0.0.a6"])
s.add_runtime_dependency(%q<webrat>, [">= 0.7.0"])
else
s.add_dependency(%q<rspec>, [">= 2.0.0.a5"])
s.add_dependency(%q<rspec>, [">= 2.0.0.a6"])
s.add_dependency(%q<webrat>, [">= 0.7.0"])
end
else
s.add_dependency(%q<rspec>, [">= 2.0.0.a5"])
s.add_dependency(%q<rspec>, [">= 2.0.0.a6"])
s.add_dependency(%q<webrat>, [">= 0.7.0"])
end
end
Expand Down

0 comments on commit e4cbe22

Please sign in to comment.