Skip to content

Commit 4858b5a

Browse files
committed
Update capybara in Gemfile.lock
Keep up to date with required gems.
1 parent 87d9437 commit 4858b5a

File tree

3 files changed

+12
-17
lines changed

3 files changed

+12
-17
lines changed

Gemfile.lock

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,12 @@ GEM
2525
atomic (1.1.14)
2626
attr_required (0.0.5)
2727
builder (3.2.2)
28-
capybara (1.1.2)
28+
capybara (2.2.0)
2929
mime-types (>= 1.16)
3030
nokogiri (>= 1.3.3)
3131
rack (>= 1.0.0)
3232
rack-test (>= 0.5.4)
33-
selenium-webdriver (~> 2.0)
34-
xpath (~> 0.1.4)
33+
xpath (~> 2.0)
3534
childprocess (0.3.9)
3635
ffi (~> 1.0, >= 1.0.11)
3736
crack (0.4.1)
@@ -50,9 +49,7 @@ GEM
5049
httpclient (2.3.4.1)
5150
i18n (0.6.5)
5251
json (1.8.1)
53-
libwebsocket (0.1.3)
54-
addressable
55-
mime-types (1.18)
52+
mime-types (2.0)
5653
mini_portile (0.5.2)
5754
minitest (4.7.5)
5855
multi_json (1.8.2)
@@ -80,14 +77,7 @@ GEM
8077
rspec-expectations (2.14.4)
8178
diff-lcs (>= 1.1.3, < 2.0)
8279
rspec-mocks (2.14.4)
83-
rubyzip (0.9.8)
8480
safe_yaml (0.9.7)
85-
selenium-webdriver (2.21.2)
86-
childprocess (>= 0.2.5)
87-
ffi (~> 1.0)
88-
libwebsocket (~> 0.1.3)
89-
multi_json (~> 1.0)
90-
rubyzip
9181
sinatra (1.4.4)
9282
rack (~> 1.4)
9383
rack-protection (~> 1.4)
@@ -99,7 +89,7 @@ GEM
9989
webmock (1.16.0)
10090
addressable (>= 2.2.7)
10191
crack (>= 0.3.2)
102-
xpath (0.1.4)
92+
xpath (2.0.0)
10393
nokogiri (~> 1.3)
10494

10595
PLATFORMS

features/step_definitions/html_steps.rb

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,11 @@
1818
end
1919

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

2524
expected_headers.each do |row|
26-
actual_headers.should include(row)
25+
actual_headers.should include(row.strip)
2726
end
2827
end
2928

features/support/env.rb

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
require "aruba/cucumber"
2+
require "capybara"
23

34
Before do
45
@aruba_timeout_seconds = 5
56
end
7+
8+
Capybara.configure do |config|
9+
config.match = :prefer_exact
10+
config.ignore_hidden_elements = false
11+
end

0 commit comments

Comments
 (0)