Skip to content

Commit

Permalink
Update gem dependency versions
Browse files Browse the repository at this point in the history
  • Loading branch information
joshuaclayton committed Jun 29, 2011
1 parent 54daa62 commit a5aee1a
Show file tree
Hide file tree
Showing 4 changed files with 42 additions and 33 deletions.
57 changes: 31 additions & 26 deletions Gemfile.lock
Expand Up @@ -36,26 +36,32 @@ GEM
activesupport (= 3.0.7)
activesupport (3.0.7)
arel (2.0.10)
aruba (0.2.3)
background_process
cucumber (~> 0.9.0)
background_process (1.2)
aruba (0.4.3)
bcat (>= 0.6.1)
childprocess (>= 0.1.9)
cucumber (>= 0.10.7)
rdiscount (>= 1.6.8)
rspec (>= 2.6.0)
bcat (0.6.1)
rack (~> 1.0)
builder (2.1.2)
cucumber (0.9.2)
builder (~> 2.1.2)
diff-lcs (~> 1.1.2)
gherkin (~> 2.2.5)
json (~> 1.4.6)
term-ansicolor (~> 1.0.5)
childprocess (0.1.9)
ffi (~> 1.0.6)
cucumber (1.0.0)
builder (>= 2.1.2)
diff-lcs (>= 1.1.2)
gherkin (~> 2.4.1)
json (>= 1.4.6)
term-ansicolor (>= 1.0.5)
diff-lcs (1.1.2)
erubis (2.6.6)
abstract (>= 1.0.0)
factory_girl (2.0.0.beta3)
gherkin (2.2.8)
json (~> 1.4.6)
term-ansicolor (~> 1.0.5)
ffi (1.0.9)
gherkin (2.4.1)
json (>= 1.4.6)
i18n (0.5.0)
json (1.4.6)
json (1.5.3)
mail (2.2.19)
activesupport (>= 2.3.6)
i18n (>= 0.4.0)
Expand All @@ -82,16 +88,15 @@ GEM
rake (>= 0.8.7)
thor (~> 0.14.4)
rake (0.8.7)
rspec (2.0.0)
rspec-core (= 2.0.0)
rspec-expectations (= 2.0.0)
rspec-mocks (= 2.0.0)
rspec-core (2.0.0)
rspec-expectations (2.0.0)
diff-lcs (>= 1.1.2)
rspec-mocks (2.0.0)
rspec-core (= 2.0.0)
rspec-expectations (= 2.0.0)
rdiscount (1.6.8)
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)
term-ansicolor (1.0.5)
thor (0.14.6)
treetop (1.4.9)
Expand All @@ -103,8 +108,8 @@ PLATFORMS

DEPENDENCIES
aruba
cucumber
cucumber (~> 1.0.0)
factory_girl_rails!
rails (= 3.0.7)
rake
rspec
rspec (~> 2.6.0)
4 changes: 2 additions & 2 deletions factory_girl_rails.gemspec
Expand Up @@ -15,8 +15,8 @@ Gem::Specification.new do |s|
s.add_runtime_dependency('railties', '>= 3.0.0')
s.add_runtime_dependency('factory_girl', '~> 2.0.0.beta')
s.add_development_dependency('rake')
s.add_development_dependency('rspec')
s.add_development_dependency('cucumber')
s.add_development_dependency('rspec', '~> 2.6.0')
s.add_development_dependency('cucumber', '~> 1.0.0')
s.add_development_dependency('aruba')
s.add_development_dependency('rails', '3.0.7')

Expand Down
8 changes: 4 additions & 4 deletions features/load_definitions.feature
Expand Up @@ -2,10 +2,10 @@ Feature: automatically load step definitions

@disable-bundler
Scenario: generate a rails 3 application and use factory definitions
When I successfully run "bundle exec rails new testapp"
When I successfully run `bundle exec rails new testapp`
And I cd to "testapp"
And I add "factory_girl_rails" from this project as a dependency
When I successfully run "bundle install"
When I successfully run `bundle install`
And I write to "db/migrate/1_create_users.rb" with:
"""
class CreateUsers < ActiveRecord::Migration
Expand All @@ -16,7 +16,7 @@ Feature: automatically load step definitions
end
end
"""
When I successfully run "bundle exec 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
Expand All @@ -41,5 +41,5 @@ Feature: automatically load step definitions
end
end
"""
When I successfully run "bundle exec rake test --trace"
When I successfully run `bundle exec rake test --trace`
Then the output should contain "1 tests, 1 assertions, 0 failures, 0 errors"
6 changes: 5 additions & 1 deletion features/support/env.rb
@@ -1,3 +1,7 @@
require 'aruba'
require 'aruba/cucumber'

PROJECT_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..', '..')).freeze

Before do
@aruba_timeout_seconds = 60
end

0 comments on commit a5aee1a

Please sign in to comment.