Skip to content

Commit

Permalink
Merge branch 'stable'
Browse files Browse the repository at this point in the history
  • Loading branch information
cavalle committed Dec 27, 2010
2 parents 58e0f57 + e4e13e1 commit cfbbedb
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 11 deletions.
6 changes: 3 additions & 3 deletions Gemfile.lock
Original file line number Original file line Diff line number Diff line change
@@ -1,8 +1,8 @@
PATH PATH
remote: . remote: .
specs: specs:
steak (1.0.0.rc.3) steak (1.0.0)
rspec rspec (>= 1.3)


GEM GEM
remote: http://rubygems.org/ remote: http://rubygems.org/
Expand Down Expand Up @@ -117,7 +117,7 @@ PLATFORMS
DEPENDENCIES DEPENDENCIES
capybara capybara
rails (>= 3.0.0) rails (>= 3.0.0)
rspec rspec (>= 1.3)
rspec-rails (>= 2.0.0) rspec-rails (>= 2.0.0)
sqlite3-ruby sqlite3-ruby
steak! steak!
Expand Down
6 changes: 0 additions & 6 deletions lib/rspec-1/steak.rb
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -12,12 +12,6 @@ module Spec::Rails::Example
class AcceptanceExampleGroup < IntegrationExampleGroup class AcceptanceExampleGroup < IntegrationExampleGroup
include ActionController::RecordIdentifier include ActionController::RecordIdentifier
Spec::Example::ExampleGroupFactory.register(:acceptance, self) Spec::Example::ExampleGroupFactory.register(:acceptance, self)

def method_missing(sym, *args, &block)
return Spec::Matchers::Be.new(sym, *args) if sym.to_s =~ /^be_/
return Spec::Matchers::Has.new(sym, *args) if sym.to_s =~ /^have_/
super
end
end end
end end
end end
4 changes: 2 additions & 2 deletions steak.gemspec
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ require "date"


Gem::Specification.new do |gem| Gem::Specification.new do |gem|
gem.name = 'steak' gem.name = 'steak'
gem.version = '1.0.0' gem.version = '1.0.1'
gem.date = Date.today.to_s gem.date = Date.today.to_s


gem.summary = "Minimalist acceptance testing on top of RSpec" gem.summary = "Minimalist acceptance testing on top of RSpec"
Expand All @@ -16,7 +16,7 @@ Gem::Specification.new do |gem|
gem.files = Dir['init.rb', 'MIT-LICENSE', 'Rakefile', 'README*', 'LICENSE*', gem.files = Dir['init.rb', 'MIT-LICENSE', 'Rakefile', 'README*', 'LICENSE*',
'{lib,spec,generators}/**/*'] & `git ls-files -z`.split("\0") '{lib,spec,generators}/**/*'] & `git ls-files -z`.split("\0")


gem.add_dependency 'rspec' gem.add_dependency 'rspec', '>= 1.3'


gem.add_development_dependency 'rspec-rails', '>= 2.0.0' gem.add_development_dependency 'rspec-rails', '>= 2.0.0'
gem.add_development_dependency 'rails', '>= 3.0.0' gem.add_development_dependency 'rails', '>= 3.0.0'
Expand Down

0 comments on commit cfbbedb

Please sign in to comment.