Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[copycopter#32] Support Bundler 1.1 & Upgrade capybara-webkit and cuc…
…umber-rails
  • Loading branch information
michaeldauria committed Mar 16, 2012
1 parent 15efab4 commit 2979f1f
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 18 deletions.
4 changes: 2 additions & 2 deletions Gemfile
Expand Up @@ -22,8 +22,8 @@ end

group :test do
gem 'bourne', '1.1.1'
gem 'capybara-webkit', '0.3.0'
gem 'cucumber-rails', '0.4.1'
gem 'capybara-webkit', '0.11.0'
gem 'cucumber-rails', '1.3.0', :require => false
gem 'database_cleaner', '0.7.1'
gem 'factory_girl_rails', '1.7.0'
gem 'fakeweb', '1.3.0'
Expand Down
27 changes: 12 additions & 15 deletions Gemfile.lock
Expand Up @@ -36,18 +36,16 @@ GEM
bourne (1.1.1)
mocha (= 0.10.4)
builder (3.0.0)
capybara (0.4.1.2)
celerity (>= 0.7.9)
culerity (>= 0.2.4)
capybara (1.1.2)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
selenium-webdriver (>= 0.0.27)
xpath (~> 0.1.3)
capybara-webkit (0.3.0)
capybara (~> 0.4.1)
celerity (0.9.2)
selenium-webdriver (~> 2.0)
xpath (~> 0.1.4)
capybara-webkit (0.11.0)
capybara (>= 1.0.0, < 1.2)
json
childprocess (0.3.1)
ffi (~> 1.0.6)
cucumber (1.1.9)
Expand All @@ -56,11 +54,10 @@ GEM
gherkin (~> 2.9.0)
json (>= 1.4.6)
term-ansicolor (>= 1.0.6)
cucumber-rails (0.4.1)
cucumber (>= 0.10.1)
nokogiri (>= 1.4.4)
rack-test (>= 0.5.7)
culerity (0.2.15)
cucumber-rails (1.3.0)
capybara (>= 1.1.2)
cucumber (>= 1.1.8)
nokogiri (>= 1.5.0)
daemons (1.1.8)
database_cleaner (0.7.1)
diff-lcs (1.1.3)
Expand Down Expand Up @@ -175,8 +172,8 @@ PLATFORMS
DEPENDENCIES
bourbon (= 1.4.0)
bourne (= 1.1.1)
capybara-webkit (= 0.3.0)
cucumber-rails (= 0.4.1)
capybara-webkit (= 0.11.0)
cucumber-rails (= 1.3.0)
database_cleaner (= 0.7.1)
dynamic_form (= 1.1.4)
factory_girl_rails (= 1.7.0)
Expand Down
2 changes: 1 addition & 1 deletion features/search_blurbs.feature
Expand Up @@ -38,7 +38,7 @@ Feature: Blurb Search
Then no visible elements should contain "No results"
When I type "find" into "Search"
Then a visible element should contain "No results"
When I type "" into "Search"
When I clear the "Search" field
Then no visible elements should contain "No results"
When I type "test" into "Search"
Then no visible elements should contain "No results"
1 change: 1 addition & 0 deletions features/step_definitions/html_steps.rb
Expand Up @@ -35,6 +35,7 @@
When /^I type "([^"]*)" into "([^"]+)"/ do |text, label|
field = find_field(label)
field.set text
field.trigger 'keyup'
sleep 1
end

Expand Down

0 comments on commit 2979f1f

Please sign in to comment.