Skip to content

Commit

Permalink
Update capybara in Gemfile.lock
Browse files Browse the repository at this point in the history
Keep up to date with required gems.
  • Loading branch information
oestrich committed Nov 26, 2013
1 parent 87d9437 commit 4858b5a
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 17 deletions.
18 changes: 4 additions & 14 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,12 @@ GEM
atomic (1.1.14)
attr_required (0.0.5)
builder (3.2.2)
capybara (1.1.2)
capybara (2.2.0)
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)
xpath (~> 2.0)
childprocess (0.3.9)
ffi (~> 1.0, >= 1.0.11)
crack (0.4.1)
Expand All @@ -50,9 +49,7 @@ GEM
httpclient (2.3.4.1)
i18n (0.6.5)
json (1.8.1)
libwebsocket (0.1.3)
addressable
mime-types (1.18)
mime-types (2.0)
mini_portile (0.5.2)
minitest (4.7.5)
multi_json (1.8.2)
Expand Down Expand Up @@ -80,14 +77,7 @@ GEM
rspec-expectations (2.14.4)
diff-lcs (>= 1.1.3, < 2.0)
rspec-mocks (2.14.4)
rubyzip (0.9.8)
safe_yaml (0.9.7)
selenium-webdriver (2.21.2)
childprocess (>= 0.2.5)
ffi (~> 1.0)
libwebsocket (~> 0.1.3)
multi_json (~> 1.0)
rubyzip
sinatra (1.4.4)
rack (~> 1.4)
rack-protection (~> 1.4)
Expand All @@ -99,7 +89,7 @@ GEM
webmock (1.16.0)
addressable (>= 2.2.7)
crack (>= 0.3.2)
xpath (0.1.4)
xpath (2.0.0)
nokogiri (~> 1.3)

PLATFORMS
Expand Down
5 changes: 2 additions & 3 deletions features/step_definitions/html_steps.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,11 @@
end

Then /^I should see the following (request|response) headers:$/ do |part, table|
text = page.find("pre.#{part}.headers").text
actual_headers = text.split("\n")
actual_headers = page.find("pre.#{part}.headers").text
expected_headers = table.raw.map { |row| row.join(": ") }

expected_headers.each do |row|
actual_headers.should include(row)
actual_headers.should include(row.strip)
end
end

Expand Down
6 changes: 6 additions & 0 deletions features/support/env.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
require "aruba/cucumber"
require "capybara"

Before do
@aruba_timeout_seconds = 5
end

Capybara.configure do |config|
config.match = :prefer_exact
config.ignore_hidden_elements = false
end

0 comments on commit 4858b5a

Please sign in to comment.