Skip to content
This repository has been archived by the owner on Nov 11, 2017. It is now read-only.

Commit

Permalink
Update dependencies.
Browse files Browse the repository at this point in the history
  • Loading branch information
Gabe Berke-Williams committed Feb 8, 2012
1 parent 933d545 commit 821e1cd
Show file tree
Hide file tree
Showing 8 changed files with 167 additions and 121 deletions.
141 changes: 80 additions & 61 deletions Gemfile.lock
Expand Up @@ -7,78 +7,89 @@ PATH
GEM
remote: http://rubygems.org/
specs:
abstract (1.0.0)
actionpack (3.0.9)
activemodel (= 3.0.9)
activesupport (= 3.0.9)
builder (~> 2.1.2)
erubis (~> 2.6.6)
i18n (~> 0.5.0)
rack (~> 1.2.1)
rack-mount (~> 0.6.14)
rack-test (~> 0.5.7)
tzinfo (~> 0.3.23)
activemodel (3.0.9)
activesupport (= 3.0.9)
builder (~> 2.1.2)
i18n (~> 0.5.0)
activesupport (3.0.9)
appraisal (0.3.5)
aruba (~> 0.3.6)
actionpack (3.2.1)
activemodel (= 3.2.1)
activesupport (= 3.2.1)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.1)
rack (~> 1.4.0)
rack-cache (~> 1.1)
rack-test (~> 0.6.1)
sprockets (~> 2.1.2)
activemodel (3.2.1)
activesupport (= 3.2.1)
builder (~> 3.0.0)
activesupport (3.2.1)
i18n (~> 0.6)
multi_json (~> 1.0)
ansi (1.4.2)
appraisal (0.4.0)
bundler
rake
aruba (0.3.7)
childprocess (>= 0.1.9)
cucumber (>= 0.10.5)
aruba (0.4.6)
bcat (>= 0.6.1)
childprocess (>= 0.2.0)
cucumber (>= 1.0.2)
rdiscount (>= 1.6.8)
rspec (>= 2.6.0)
builder (2.1.2)
capybara (1.0.0.rc1)
bcat (0.6.2)
rack (~> 1.0)
builder (3.0.0)
capybara (1.1.2)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
selenium-webdriver (~> 0.2.0)
selenium-webdriver (~> 2.0)
xpath (~> 0.1.4)
childprocess (0.1.9)
childprocess (0.3.1)
ffi (~> 1.0.6)
cucumber (0.10.6)
cucumber (1.1.4)
builder (>= 2.1.2)
diff-lcs (>= 1.1.2)
gherkin (~> 2.4.0)
gherkin (~> 2.7.1)
json (>= 1.4.6)
term-ansicolor (>= 1.0.5)
term-ansicolor (>= 1.0.6)
cucumber-rails (0.5.2)
capybara (>= 1.0.0.rc1)
cucumber (>= 0.10.5)
nokogiri (>= 1.4.4)
rack-test (>= 0.5.7)
daemons (1.1.3)
database_cleaner (0.6.7)
diff-lcs (1.1.2)
erubis (2.6.6)
abstract (>= 1.0.0)
daemons (1.1.8)
database_cleaner (0.7.1)
diff-lcs (1.1.3)
erubis (2.7.0)
eventmachine (0.12.10)
ffi (1.0.9)
gherkin (2.4.0)
ffi (1.0.11)
gherkin (2.7.6)
json (>= 1.4.6)
i18n (0.5.0)
json (1.5.1)
json_pure (1.5.1)
mime-types (1.16)
nokogiri (1.4.4)
rack (1.2.3)
rack-mount (0.6.14)
rack (>= 1.0.0)
rack-test (0.5.7)
hike (1.2.1)
i18n (0.6.0)
journey (1.0.1)
json (1.6.5)
mime-types (1.17.2)
minitest (2.11.1)
multi_json (1.0.4)
nokogiri (1.5.0)
rack (1.4.1)
rack-cache (1.1)
rack (>= 0.4)
rack-ssl (1.3.2)
rack
rack-test (0.6.1)
rack (>= 1.0)
railties (3.0.9)
actionpack (= 3.0.9)
activesupport (= 3.0.9)
railties (3.2.1)
actionpack (= 3.2.1)
activesupport (= 3.2.1)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (~> 0.14.4)
rake (0.9.2)
rdoc (3.7)
thor (~> 0.14.6)
rake (0.9.2.2)
rdiscount (1.6.8)
rdoc (3.12)
json (~> 1.4)
rspec (2.6.0)
rspec-core (~> 2.6.0)
rspec-expectations (~> 2.6.0)
Expand All @@ -92,34 +103,42 @@ GEM
activesupport (~> 3.0)
railties (~> 3.0)
rspec (~> 2.6.0)
rubyzip (0.9.4)
selenium-webdriver (0.2.1)
childprocess (>= 0.1.7)
ffi (>= 1.0.7)
json_pure
rubyzip (0.9.5)
selenium-webdriver (2.18.0)
childprocess (>= 0.2.5)
ffi (~> 1.0.9)
multi_json (~> 1.0.4)
rubyzip
sqlite3 (1.3.3)
sprockets (2.1.2)
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.5)
sqlite3-ruby (1.3.3)
sqlite3 (>= 1.3.3)
term-ansicolor (1.0.5)
thin (1.2.11)
term-ansicolor (1.0.7)
thin (1.3.1)
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
thor (0.14.6)
tzinfo (0.3.29)
tilt (1.3.3)
turn (0.9.1)
ansi
minitest
xpath (0.1.4)
nokogiri (~> 1.3)

PLATFORMS
ruby

DEPENDENCIES
appraisal (~> 0.3)
appraisal (~> 0.4)
aruba
cucumber-rails (~> 0.5.1)
cucumber-rails (~> 0.5.2)
database_cleaner
diesel!
rspec-rails (~> 2.6.1)
sqlite3-ruby
thin
turn
5 changes: 3 additions & 2 deletions diesel.gemspec
Expand Up @@ -19,13 +19,14 @@ Gem::Specification.new do |s|

s.add_dependency('railties')

s.add_development_dependency('cucumber-rails', '~> 0.5.1')
s.add_development_dependency('cucumber-rails', '~> 0.5.2')
s.add_development_dependency('aruba')
s.add_development_dependency('appraisal', '~> 0.3')
s.add_development_dependency('appraisal', '~> 0.4')
s.add_development_dependency('rspec-rails', '~> 2.6.1')
s.add_development_dependency('thin')
s.add_development_dependency('sqlite3-ruby')
s.add_development_dependency('database_cleaner')
s.add_development_dependency('turn')

s.platform = Gem::Platform::RUBY
s.rubygems_version = %q{1.2.0}
Expand Down
11 changes: 6 additions & 5 deletions features/features_generator.feature
Expand Up @@ -60,19 +60,20 @@ Feature: reusable features generator
When I write to "features/step_definitions/engine/example_steps.rb" with:
"""
Then %{I should receive a warm greeting} do
Then %{I should see "Hello there"}
page.should have_content("Hello there")
end
"""
When I cd to ".."
And I successfully run `bundle exec rails new testapp`
And I cd to "testapp"
And I append to "Gemfile" with:
"""
gem "cucumber-rails", ">= 0.5.1"
gem "capybara", ">= 1.0.0.beta1"
gem "capybara", "~> 1.0.0"
gem "rspec"
gem "database_cleaner", :group => :test
group :test do
gem "database_cleaner"
gem "cucumber-rails", "~> 0.5.2"
end
"""
When I add the "testengine" as a diesel engine
And I reset Bundler environment variable
Expand Down
10 changes: 10 additions & 0 deletions features/install_generator.feature
Expand Up @@ -99,6 +99,16 @@ Feature: reusable install generator
When I go to the examples page
Then I should see "Hello there"
"""
When I write to "features/step_definitions/engine/example_steps.rb" with:
"""
Then %{I should see "Hello there"} do
page.should have_content("Hello there")
end
When "I go to the examples page" do
visit examples_path
end
"""
When I run `bundle exec cucumber features/examples.feature`
Then it should pass with:
"""
Expand Down
6 changes: 5 additions & 1 deletion features/integration_testing.feature
Expand Up @@ -76,7 +76,11 @@ Feature: integration testing
When I write to "features/step_definitions/engine/example_steps.rb" with:
"""
Then %{I should receive a warm greeting} do
Then %{I should see "Hello there"}
page.should have_content "Hello there"
end
When "I go to the examples page" do
visit examples_path
end
"""
When I write to "lib/generators/testengine/install/install_generator.rb" with:
Expand Down
48 changes: 27 additions & 21 deletions gemfiles/3.0.9.gemfile.lock
Expand Up @@ -34,7 +34,8 @@ GEM
activemodel (= 3.0.9)
activesupport (= 3.0.9)
activesupport (3.0.9)
appraisal (0.3.8)
ansi (1.4.2)
appraisal (0.4.0)
bundler
rake
arel (2.0.10)
Expand All @@ -47,47 +48,48 @@ GEM
bcat (0.6.2)
rack (~> 1.0)
builder (2.1.2)
capybara (1.1.1)
capybara (1.1.2)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
selenium-webdriver (~> 2.0)
xpath (~> 0.1.4)
childprocess (0.2.2)
childprocess (0.3.1)
ffi (~> 1.0.6)
cucumber (1.1.2)
cucumber (1.1.4)
builder (>= 2.1.2)
diff-lcs (>= 1.1.2)
gherkin (~> 2.6.2)
gherkin (~> 2.7.1)
json (>= 1.4.6)
term-ansicolor (>= 1.0.6)
cucumber-rails (0.5.2)
capybara (>= 1.0.0.rc1)
cucumber (>= 0.10.5)
nokogiri (>= 1.4.4)
rack-test (>= 0.5.7)
daemons (1.1.4)
database_cleaner (0.6.7)
daemons (1.1.8)
database_cleaner (0.7.1)
diff-lcs (1.1.3)
erubis (2.6.6)
abstract (>= 1.0.0)
eventmachine (0.12.10)
ffi (1.0.10)
gherkin (2.6.3)
ffi (1.0.11)
gherkin (2.7.6)
json (>= 1.4.6)
i18n (0.5.0)
json (1.6.1)
json_pure (1.6.1)
json (1.6.5)
mail (2.2.19)
activesupport (>= 2.3.6)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.17.2)
minitest (2.11.1)
multi_json (1.0.4)
nokogiri (1.5.0)
polyglot (0.3.3)
rack (1.2.4)
rack (1.2.5)
rack-mount (0.6.14)
rack (>= 1.0.0)
rack-test (0.5.7)
Expand All @@ -108,7 +110,7 @@ GEM
thor (~> 0.14.4)
rake (0.9.2.2)
rdiscount (1.6.8)
rdoc (3.11)
rdoc (3.12)
json (~> 1.4)
rspec (2.6.0)
rspec-core (~> 2.6.0)
Expand All @@ -123,24 +125,27 @@ GEM
activesupport (~> 3.0)
railties (~> 3.0)
rspec (~> 2.6.0)
rubyzip (0.9.4)
selenium-webdriver (2.12.1)
childprocess (>= 0.2.1)
rubyzip (0.9.5)
selenium-webdriver (2.18.0)
childprocess (>= 0.2.5)
ffi (~> 1.0.9)
json_pure
multi_json (~> 1.0.4)
rubyzip
sqlite3 (1.3.4)
sqlite3 (1.3.5)
sqlite3-ruby (1.3.3)
sqlite3 (>= 1.3.3)
term-ansicolor (1.0.7)
thin (1.2.11)
thin (1.3.1)
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
thor (0.14.6)
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
turn (0.9.1)
ansi
minitest
tzinfo (0.3.31)
xpath (0.1.4)
nokogiri (~> 1.3)
Expand All @@ -149,12 +154,13 @@ PLATFORMS
ruby

DEPENDENCIES
appraisal (~> 0.3)
appraisal (~> 0.4)
aruba
cucumber-rails (~> 0.5.1)
cucumber-rails (~> 0.5.2)
database_cleaner
diesel!
rails (= 3.0.9)
rspec-rails (~> 2.6.1)
sqlite3-ruby
thin
turn

0 comments on commit 821e1cd

Please sign in to comment.