Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Update dependencies and get tests passing.

  • Loading branch information...
commit 34d9f4a6b8f190ed154a484d2fb444bcb60b4ba5 1 parent 058724b
@gabebw gabebw authored
View
6 features/rails_integration.feature
@@ -13,7 +13,7 @@ Feature: integrate with Rails
end
end
"""
- When I successfully run "rake db:migrate --trace"
+ When I successfully run `bundle exec rake db:migrate --trace`
And I write to "app/models/user.rb" with:
"""
class User < ActiveRecord::Base
@@ -54,7 +54,7 @@ Feature: integrate with Rails
should assign_to(:example)
end
"""
- When I successfully run "rake test TESTOPTS=-v --trace"
+ When I successfully run `bundle exec rake test TESTOPTS='-v' --trace`
Then the output should contain "1 tests, 1 assertions, 0 failures, 0 errors"
And the output should contain "2 tests, 2 assertions, 0 failures, 0 errors"
And the output should contain "User should require name to be set"
@@ -81,7 +81,7 @@ Feature: integrate with Rails
it { should assign_to(:example) }
end
"""
- When I successfully run "rake spec SPEC_OPTS=-fs --trace"
+ When I successfully run `bundle exec rake spec SPEC_OPTS=-fs --trace`
Then the output should contain "2 examples, 0 failures"
And the output should contain "should require name to be set"
And the output should contain "should assign @example"
View
20 features/step_definitions/rails_steps.rb
@@ -3,49 +3,49 @@
When /^I generate a new rails application$/ do
steps %{
- When I run "rails _3.0.3_ new #{APP_NAME}"
+ When I run `rails _3.0.12_ new #{APP_NAME}`
And I cd to "#{APP_NAME}"
And I write to "Gemfile" with:
"""
source "http://rubygems.org"
- gem 'rails', '3.0.3'
- gem 'sqlite3-ruby', :require => 'sqlite3'
+ gem 'rails', '3.0.12'
+ gem 'sqlite3'
"""
- And I successfully run "bundle install --local"
+ And I successfully run `bundle install --local`
}
end
When /^I configure the application to use "([^\"]+)" from this project$/ do |name|
append_to_gemfile "gem '#{name}', :path => '#{PROJECT_ROOT}'"
- steps %{And I run "bundle install --local"}
+ steps %{And I run `bundle install --local`}
end
When /^I run the rspec generator$/ do
steps %{
- When I successfully run "rails generate rspec:install"
+ When I successfully run `rails generate rspec:install`
}
end
When /^I configure the application to use rspec\-rails$/ do
append_to_gemfile "gem 'rspec-rails'"
- steps %{And I run "bundle install --local"}
+ steps %{And I run `bundle install --local`}
end
When /^I configure the application to use shoulda-context$/ do
append_to_gemfile "gem 'shoulda-context', :git => 'git@github.com:thoughtbot/shoulda-context.git'"
- steps %{And I run "bundle install --local"}
+ steps %{And I run `bundle install --local`}
end
When /^I configure the application to use shoulda$/ do
append_to_gemfile "gem 'shoulda-matchers', :git => 'git@github.com:thoughtbot/shoulda-matchers.git', :require => false"
append_to_gemfile "gem 'shoulda-context', :git => 'git@github.com:thoughtbot/shoulda-context.git', :require => false"
append_to_gemfile "gem 'shoulda', :path => '../../..'"
- steps %{And I run "bundle install --local"}
+ steps %{And I run `bundle install --local`}
end
When /^I configure the application to use shoulda-matchers$/ do
append_to_gemfile "gem 'shoulda-matchers', :git => 'git@github.com:thoughtbot/shoulda-matchers.git'"
- steps %{And I run "bundle install --local"}
+ steps %{And I run `bundle install --local`}
end
When /^I configure a wildcard route$/ do
View
8 shoulda.gemspec
@@ -20,9 +20,9 @@ Gem::Specification.new do |s|
s.add_dependency("shoulda-context", "~> 1.0.0")
s.add_dependency("shoulda-matchers", "~> 1.0.0")
- s.add_development_dependency("rails", "3.0.3")
+ s.add_development_dependency("rails", "3.0.12")
s.add_development_dependency("sqlite3", "~> 1.3.2")
- s.add_development_dependency("rspec-rails", "~> 2.3.1")
- s.add_development_dependency("cucumber", "~> 0.10.0")
- s.add_development_dependency("aruba", "~> 0.2.7")
+ s.add_development_dependency("rspec-rails", "~> 2.7.0")
+ s.add_development_dependency("cucumber", "~> 1.1.0")
+ s.add_development_dependency("aruba", "~> 0.4.11")
end
Please sign in to comment.
Something went wrong with that request. Please try again.