Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Update dependencies.

  • Loading branch information...
commit 6dc4ad42ac86c5239f91e9d046e2e13bee7e36bb 1 parent 030cd5f
Tristan Dunn authored
16 Gemfile.lock
@@ -14,15 +14,15 @@ GEM
14 14 bourne (1.3.0)
15 15 mocha (= 0.13.0)
16 16 builder (3.1.4)
17   - capybara (1.1.4)
  17 + capybara (2.0.2)
18 18 mime-types (>= 1.16)
19 19 nokogiri (>= 1.3.3)
20 20 rack (>= 1.0.0)
21 21 rack-test (>= 0.5.4)
22 22 selenium-webdriver (~> 2.0)
23   - xpath (~> 0.1.4)
24   - capybara-webkit (0.13.0)
25   - capybara (>= 1.0.0, < 1.2)
  23 + xpath (~> 1.0.0)
  24 + capybara-webkit (0.14.0)
  25 + capybara (~> 2.0, >= 2.0.2)
26 26 json
27 27 childprocess (0.3.6)
28 28 ffi (~> 1.0, >= 1.0.6)
@@ -50,7 +50,7 @@ GEM
50 50 gherkin (2.11.5)
51 51 json (>= 1.4.6)
52 52 http_parser.rb (0.5.3)
53   - json (1.7.5)
  53 + json (1.7.6)
54 54 libwebsocket (0.1.7.1)
55 55 addressable
56 56 websocket
@@ -77,7 +77,7 @@ GEM
77 77 rspec-core (2.12.2)
78 78 rspec-expectations (2.12.1)
79 79 diff-lcs (~> 1.1.3)
80   - rspec-mocks (2.12.0)
  80 + rspec-mocks (2.12.1)
81 81 rubyzip (0.9.9)
82 82 selenium-webdriver (2.27.2)
83 83 childprocess (>= 0.2.5)
@@ -95,7 +95,7 @@ GEM
95 95 rack (>= 1.0.0)
96 96 tilt (1.3.3)
97 97 websocket (1.0.6)
98   - xpath (0.1.4)
  98 + xpath (1.0.0)
99 99 nokogiri (~> 1.3)
100 100 yard (0.8.3)
101 101
@@ -104,7 +104,7 @@ PLATFORMS
104 104
105 105 DEPENDENCIES
106 106 bourne (= 1.3.0)
107   - capybara-webkit (= 0.13.0)
  107 + capybara-webkit (= 0.14.0)
108 108 cucumber (= 1.2.1)
109 109 pusher (= 0.11.2)
110 110 pusher-fake!
2  features/step_definitions/channel_steps.rb
@@ -61,7 +61,7 @@
61 61 end
62 62
63 63 Then %{I should be subscribed to the "$channel" channel} do |channel|
64   - Capybara.timeout do
  64 + timeout_after(5) do
65 65 subscribed = page.evaluate_script(%{
66 66 var
67 67 channel = Pusher.instance.channel(#{MultiJson.dump(channel)});
4 features/step_definitions/client_steps.rb
@@ -14,14 +14,14 @@
14 14 end
15 15
16 16 Then "I should be connected" do
17   - Capybara.timeout do
  17 + timeout_after(5) do
18 18 state = page.evaluate_script("Pusher.instance.connection.state")
19 19 state == "connected"
20 20 end
21 21 end
22 22
23 23 Then "I should not be connected" do
24   - Capybara.timeout do
  24 + timeout_after(5) do
25 25 state = page.evaluate_script("Pusher.instance.connection.state")
26 26 state == "unavailable"
27 27 end
2  features/step_definitions/webhook_steps.rb
@@ -7,7 +7,7 @@
7 7 end
8 8 end if user_event
9 9
10   - Capybara.timeout do
  10 + timeout_after(5) do
11 11 $events.include?(event)
12 12 end
13 13
15 features/support/timing.rb
... ... @@ -0,0 +1,15 @@
  1 +module Capybara
  2 + module Timing
  3 + def wait(seconds = 0.25, &block)
  4 + sleep(seconds) && yield
  5 + end
  6 +
  7 + def timeout_after(seconds, &block)
  8 + Timeout::timeout(seconds) do
  9 + sleep(0.05) until yield
  10 + end
  11 + end
  12 + end
  13 +end
  14 +
  15 +World(Capybara::Timing)
9 features/support/wait.rb
... ... @@ -1,9 +0,0 @@
1   -module Capybara
2   - module Wait
3   - def wait(seconds = 0.25, &block)
4   - sleep(seconds) && yield
5   - end
6   - end
7   -end
8   -
9   -World(Capybara::Wait)
4 features/support/webhooks.rb
@@ -28,8 +28,8 @@ def self.call(environment)
28 28 at_exit { thread.exit }
29 29
30 30 # Wait for the webhook endpoint server to start.
31   - Capybara.timeout do
32   - thread[:ready]
  31 + Timeout::timeout(5) do
  32 + sleep(0.05) until thread[:ready]
33 33 end
34 34 end
35 35
2  pusher-fake.gemspec
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
19 19 s.add_dependency "multi_json", "1.5.0"
20 20
21 21 s.add_development_dependency "bourne", "1.3.0"
22   - s.add_development_dependency "capybara-webkit", "0.13.0"
  22 + s.add_development_dependency "capybara-webkit", "0.14.0"
23 23 s.add_development_dependency "cucumber", "1.2.1"
24 24 s.add_development_dependency "pusher", "0.11.2"
25 25 s.add_development_dependency "rake", "10.0.3"

0 comments on commit 6dc4ad4

Please sign in to comment.
Something went wrong with that request. Please try again.