Permalink
Browse files

Tests are passing again in master.

  • Loading branch information...
1 parent a82e6f0 commit b32d3760a47a6aa2036c50eb01ae48431e7d42cd @mike-burns mike-burns committed Jun 10, 2011
View
@@ -3,7 +3,6 @@ gem "cucumber"
gem "aruba"
gem "rake"
gem "rspec-rails", :require => false
-gem "rails", ">= 3.0.3", :require => false
+gem "rails", "3.0.7", :require => false
gem "thin"
gem "sqlite3-ruby", :require => false
-
View
@@ -2,111 +2,115 @@ GEM
remote: http://rubygems.org/
specs:
abstract (1.0.0)
- actionmailer (3.0.3)
- actionpack (= 3.0.3)
- mail (~> 2.2.9)
- actionpack (3.0.3)
- activemodel (= 3.0.3)
- activesupport (= 3.0.3)
+ actionmailer (3.0.7)
+ actionpack (= 3.0.7)
+ mail (~> 2.2.15)
+ actionpack (3.0.7)
+ activemodel (= 3.0.7)
+ activesupport (= 3.0.7)
builder (~> 2.1.2)
erubis (~> 2.6.6)
- i18n (~> 0.4)
+ i18n (~> 0.5.0)
rack (~> 1.2.1)
- rack-mount (~> 0.6.13)
- rack-test (~> 0.5.6)
+ rack-mount (~> 0.6.14)
+ rack-test (~> 0.5.7)
tzinfo (~> 0.3.23)
- activemodel (3.0.3)
- activesupport (= 3.0.3)
+ activemodel (3.0.7)
+ activesupport (= 3.0.7)
builder (~> 2.1.2)
- i18n (~> 0.4)
- activerecord (3.0.3)
- activemodel (= 3.0.3)
- activesupport (= 3.0.3)
+ i18n (~> 0.5.0)
+ activerecord (3.0.7)
+ activemodel (= 3.0.7)
+ activesupport (= 3.0.7)
arel (~> 2.0.2)
tzinfo (~> 0.3.23)
- activeresource (3.0.3)
- activemodel (= 3.0.3)
- activesupport (= 3.0.3)
- activesupport (3.0.3)
- arel (2.0.6)
- aruba (0.2.7)
- background_process
- cucumber (~> 0.10.0)
- background_process (1.2)
+ activeresource (3.0.7)
+ activemodel (= 3.0.7)
+ activesupport (= 3.0.7)
+ activesupport (3.0.7)
+ arel (2.0.10)
+ aruba (0.3.7)
+ childprocess (>= 0.1.9)
+ cucumber (>= 0.10.5)
+ rspec (>= 2.6.0)
builder (2.1.2)
- cucumber (0.10.0)
+ childprocess (0.1.9)
+ ffi (~> 1.0.6)
+ cucumber (0.10.6)
builder (>= 2.1.2)
- diff-lcs (~> 1.1.2)
- gherkin (~> 2.3.2)
- json (~> 1.4.6)
- term-ansicolor (~> 1.0.5)
- daemons (1.1.0)
+ diff-lcs (>= 1.1.2)
+ gherkin (~> 2.4.0)
+ json (>= 1.4.6)
+ term-ansicolor (>= 1.0.5)
+ daemons (1.1.3)
diff-lcs (1.1.2)
erubis (2.6.6)
abstract (>= 1.0.0)
eventmachine (0.12.10)
- gherkin (2.3.2)
- json (~> 1.4.6)
- term-ansicolor (~> 1.0.5)
+ ffi (1.0.9)
+ gherkin (2.4.0)
+ json (>= 1.4.6)
i18n (0.5.0)
- json (1.4.6)
- mail (2.2.12)
+ json (1.5.1)
+ mail (2.2.19)
activesupport (>= 2.3.6)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.16)
polyglot (0.3.1)
- rack (1.2.1)
- rack-mount (0.6.13)
+ rack (1.2.3)
+ rack-mount (0.6.14)
rack (>= 1.0.0)
- rack-test (0.5.6)
+ rack-test (0.5.7)
rack (>= 1.0)
- rails (3.0.3)
- actionmailer (= 3.0.3)
- actionpack (= 3.0.3)
- activerecord (= 3.0.3)
- activeresource (= 3.0.3)
- activesupport (= 3.0.3)
+ rails (3.0.7)
+ actionmailer (= 3.0.7)
+ actionpack (= 3.0.7)
+ activerecord (= 3.0.7)
+ activeresource (= 3.0.7)
+ activesupport (= 3.0.7)
bundler (~> 1.0)
- railties (= 3.0.3)
- railties (3.0.3)
- actionpack (= 3.0.3)
- activesupport (= 3.0.3)
+ railties (= 3.0.7)
+ railties (3.0.7)
+ actionpack (= 3.0.7)
+ activesupport (= 3.0.7)
rake (>= 0.8.7)
thor (~> 0.14.4)
- rake (0.8.7)
- rspec (2.3.0)
- rspec-core (~> 2.3.0)
- rspec-expectations (~> 2.3.0)
- rspec-mocks (~> 2.3.0)
- rspec-core (2.3.1)
- rspec-expectations (2.3.0)
+ rake (0.9.2)
+ 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.3.0)
- rspec-rails (2.3.1)
+ rspec-mocks (2.6.0)
+ rspec-rails (2.6.1)
actionpack (~> 3.0)
activesupport (~> 3.0)
railties (~> 3.0)
- rspec (~> 2.3.0)
- sqlite3-ruby (1.3.2)
+ rspec (~> 2.6.0)
+ sqlite3 (1.3.3)
+ sqlite3-ruby (1.3.3)
+ sqlite3 (>= 1.3.3)
term-ansicolor (1.0.5)
- thin (1.2.7)
+ thin (1.2.11)
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
thor (0.14.6)
treetop (1.4.9)
polyglot (>= 0.3.1)
- tzinfo (0.3.23)
+ tzinfo (0.3.27)
PLATFORMS
ruby
DEPENDENCIES
aruba
cucumber
- rails (>= 3.0.3)
+ rails (= 3.0.7)
rake
rspec-rails
sqlite3-ruby
@@ -43,7 +43,7 @@ Feature: test a diesel engine using the bootstrapped application
end
end
"""
- When I run "bundle exec rspec --format documentation spec"
+ When I run `bundle exec rspec --format documentation spec`
Then it should pass with:
"""
0 failures
@@ -69,7 +69,7 @@ Feature: test a diesel engine using the bootstrapped application
end
end
"""
- When I run "bundle exec rspec --format documentation spec"
+ When I run `bundle exec rspec --format documentation spec`
Then it should pass with:
"""
0 failures
@@ -99,7 +99,7 @@ Feature: test a diesel engine using the bootstrapped application
"""
hello
"""
- When I run "bundle exec rspec --format documentation spec"
+ When I run `bundle exec rspec --format documentation spec`
Then it should pass with:
"""
0 failures
@@ -9,7 +9,7 @@ Feature: test a diesel engine using cucumber
gem "cucumber-rails", "~> 0.3.2"
gem "capybara", "~> 0.4.0"
gem "rails", "~> 3.0.3"
- gem "rspec", "~> 1.3.0"
+ gem "rspec", "~> 2.6.0"
gem "sqlite3-ruby"
gem "formtastic", "~> 1.2.3"
"""
@@ -61,7 +61,7 @@ Feature: test a diesel engine using cucumber
hello!
<% end -%>
"""
- When I run "bundle exec cucumber features/hello.feature"
+ When I run `bundle exec cucumber features/hello.feature`
Then it should pass with:
"""
1 scenario (1 passed)
@@ -82,7 +82,7 @@ Feature: test a diesel engine using cucumber
end
end
"""
- When I run "bundle exec cucumber features/hello.feature"
+ When I run `bundle exec cucumber features/hello.feature`
Then it should pass with:
"""
1 scenario (1 passed)
@@ -65,29 +65,29 @@ Feature: reusable features generator
end
"""
When I cd to ".."
- And I successfully run "rails new testapp"
+ And I successfully run `bundle exec rails new testapp`
And I cd to "testapp"
And I append to "Gemfile" with:
"""
gem "cucumber-rails", "~> 0.3.2"
gem "capybara", "~> 0.4.0"
- gem "rspec", "~> 1.3.0"
+ gem "rspec", "~> 2.6.0"
"""
When I add the "testengine" as a diesel engine
- And I run "bundle install --local"
- And I successfully run "rails generate cucumber:install --trace"
- And I successfully run "rails generate testengine:features --trace"
+ And I run `bundle install --local`
+ And I successfully run `bundle exec rails generate cucumber:install --trace`
+ And I successfully run `bundle exec rails generate testengine:features --trace`
Scenario: copy features into an app from a diesel engine
- When I run "bundle exec cucumber -r features features/testengine/examples.feature"
+ When I run `bundle exec cucumber -r features features/testengine/examples.feature`
Then it should pass with:
"""
1 scenario (1 passed)
"""
Scenario: view generator descriptions from an app with a diesel engine
- When I successfully run "rails generate testengine:features -h"
+ When I successfully run `bundle exec rails generate testengine:features -h`
Then the output should contain:
"""
Copy cucumber feature files for the engine into your application.
@@ -74,20 +74,20 @@ Feature: reusable install generator
<% end -%>
"""
When I cd to ".."
- And I successfully run "rails new testapp"
+ And I successfully run `bundle exec rails new testapp`
And I cd to "testapp"
And I append to "Gemfile" with:
"""
gem "cucumber-rails", "~> 0.3.2"
gem "capybara", "~> 0.4.0"
- gem "rspec", "~> 1.3.0"
+ gem "rspec", "~> 2.6.0"
"""
When I add the "testengine" as a diesel engine
- And I run "bundle install --local"
- And I successfully run "rails generate cucumber:install --trace"
- And I successfully run "rails generate testengine:install --trace"
- And I successfully run "rake db:migrate db:schema:dump db:test:prepare --trace"
+ And I run `bundle install --local`
+ And I successfully run `bundle exec rails generate cucumber:install --trace`
+ And I successfully run `bundle exec rails generate testengine:install --trace`
+ And I successfully run `bundle exec rake db:migrate db:schema:dump db:test:prepare --trace`
Scenario: test a generated app with a diesel engine
When I write to "features/examples.feature" with:
@@ -97,20 +97,20 @@ Feature: reusable install generator
When I go to the examples page
Then I should see "Hello there"
"""
- When I run "bundle exec cucumber features/examples.feature"
+ When I run `bundle exec cucumber features/examples.feature`
Then it should pass with:
"""
1 scenario (1 passed)
"""
Scenario: view generator descriptions from an app with a diesel engine
- When I successfully run "rails generate testengine:install -h"
+ When I successfully run `bundle exec rails generate testengine:install -h`
Then the output should contain:
"""
Generate configuration, migration, and other essential files.
"""
Scenario: run the install generator twice
- When I successfully run "rails generate testengine:install --trace"
+ When I successfully run `bundle exec rails generate testengine:install --trace`
Then the output should not contain "Another migration is already named"
@@ -1,6 +1,6 @@
@disable-bundler
Feature: integration testing
-
+ @slow
Scenario: test integration of a diesel engine with a generated application
Given a directory named "testengine"
When I cd to "testengine"
@@ -18,7 +18,8 @@ Feature: integration testing
"""
gem "cucumber"
gem "aruba"
- gem "rspec", "~> 1.3.0"
+ gem "rspec", "~> 2.6.0"
+ gem "rails", "3.0.7"
"""
When I add this library as a dependency
And I write to "db/migrate/create_examples.rb" with:
@@ -106,25 +107,28 @@ Feature: integration testing
@disable-bundler @puts @announce
Feature: integrate with application
Scenario: generate a Rails app, run the generates, and run the tests
- When I successfully run "rails new testapp"
+ When I successfully run `bundle exec rails new testapp`
And I cd to "testapp"
And I add the "cucumber-rails" gem
And I add the "capybara" gem
And I add the "rspec-rails" gem
And I add the "testengine" gem from this project
And I add the "diesel" gem from the diesel project
- And I run "bundle install --local"
- And I successfully run "rails generate cucumber:install"
- And I successfully run "rails generate testengine:install"
- And I successfully run "rails generate testengine:features"
- And I successfully run "rake db:migrate --trace"
- And I successfully run "rake --trace"
+ And I run `bundle install --local`
+ And I successfully run `bundle exec rails generate cucumber:install`
+ And I successfully run `bundle exec rails generate testengine:install`
+ And I successfully run `bundle exec rails generate testengine:features`
+ And I successfully run `bundle exec rake db:migrate --trace`
+ And I successfully run `bundle exec rake --trace`
Then the output should contain "1 scenario (1 passed)"
And the output should not contain "Could not find generator"
"""
When I write to "features/support/env.rb" with:
"""
require "diesel/testing/integration"
+ Before do
+ @aruba_timeout_seconds = 120
+ end
"""
When I write to "features/step_definitions/dependency_steps.rb" with:
"""
@@ -133,8 +137,8 @@ Feature: integration testing
append_to_file('Gemfile', %{\ngem "#{gem_name}", :path => "../../../../../.."\n})
end
"""
- When I run "bundle install --local"
- And I run "bundle exec cucumber features/integration.feature"
+ When I run `bundle install --local`
+ And I successfully run `bundle exec cucumber features/integration.feature`
Then it should pass with:
"""
1 scenario (1 passed)
Oops, something went wrong.

0 comments on commit b32d376

Please sign in to comment.