Permalink
Browse files

Update dependencies.

  • Loading branch information...
1 parent 030cd5f commit 6dc4ad42ac86c5239f91e9d046e2e13bee7e36bb @tristandunn committed Jan 4, 2013
View
@@ -14,15 +14,15 @@ GEM
bourne (1.3.0)
mocha (= 0.13.0)
builder (3.1.4)
- capybara (1.1.4)
+ capybara (2.0.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)
- capybara-webkit (0.13.0)
- capybara (>= 1.0.0, < 1.2)
+ xpath (~> 1.0.0)
+ capybara-webkit (0.14.0)
+ capybara (~> 2.0, >= 2.0.2)
json
childprocess (0.3.6)
ffi (~> 1.0, >= 1.0.6)
@@ -50,7 +50,7 @@ GEM
gherkin (2.11.5)
json (>= 1.4.6)
http_parser.rb (0.5.3)
- json (1.7.5)
+ json (1.7.6)
libwebsocket (0.1.7.1)
addressable
websocket
@@ -77,7 +77,7 @@ GEM
rspec-core (2.12.2)
rspec-expectations (2.12.1)
diff-lcs (~> 1.1.3)
- rspec-mocks (2.12.0)
+ rspec-mocks (2.12.1)
rubyzip (0.9.9)
selenium-webdriver (2.27.2)
childprocess (>= 0.2.5)
@@ -95,7 +95,7 @@ GEM
rack (>= 1.0.0)
tilt (1.3.3)
websocket (1.0.6)
- xpath (0.1.4)
+ xpath (1.0.0)
nokogiri (~> 1.3)
yard (0.8.3)
@@ -104,7 +104,7 @@ PLATFORMS
DEPENDENCIES
bourne (= 1.3.0)
- capybara-webkit (= 0.13.0)
+ capybara-webkit (= 0.14.0)
cucumber (= 1.2.1)
pusher (= 0.11.2)
pusher-fake!
@@ -61,7 +61,7 @@
end
Then %{I should be subscribed to the "$channel" channel} do |channel|
- Capybara.timeout do
+ timeout_after(5) do
subscribed = page.evaluate_script(%{
var
channel = Pusher.instance.channel(#{MultiJson.dump(channel)});
@@ -14,14 +14,14 @@
end
Then "I should be connected" do
- Capybara.timeout do
+ timeout_after(5) do
state = page.evaluate_script("Pusher.instance.connection.state")
state == "connected"
end
end
Then "I should not be connected" do
- Capybara.timeout do
+ timeout_after(5) do
state = page.evaluate_script("Pusher.instance.connection.state")
state == "unavailable"
end
@@ -7,7 +7,7 @@
end
end if user_event
- Capybara.timeout do
+ timeout_after(5) do
$events.include?(event)
end
View
@@ -0,0 +1,15 @@
+module Capybara
+ module Timing
+ def wait(seconds = 0.25, &block)
+ sleep(seconds) && yield
+ end
+
+ def timeout_after(seconds, &block)
+ Timeout::timeout(seconds) do
+ sleep(0.05) until yield
+ end
+ end
+ end
+end
+
+World(Capybara::Timing)
View
@@ -1,9 +0,0 @@
-module Capybara
- module Wait
- def wait(seconds = 0.25, &block)
- sleep(seconds) && yield
- end
- end
-end
-
-World(Capybara::Wait)
@@ -28,8 +28,8 @@ def self.call(environment)
at_exit { thread.exit }
# Wait for the webhook endpoint server to start.
- Capybara.timeout do
- thread[:ready]
+ Timeout::timeout(5) do
+ sleep(0.05) until thread[:ready]
end
end
View
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
s.add_dependency "multi_json", "1.5.0"
s.add_development_dependency "bourne", "1.3.0"
- s.add_development_dependency "capybara-webkit", "0.13.0"
+ s.add_development_dependency "capybara-webkit", "0.14.0"
s.add_development_dependency "cucumber", "1.2.1"
s.add_development_dependency "pusher", "0.11.2"
s.add_development_dependency "rake", "10.0.3"

0 comments on commit 6dc4ad4

Please sign in to comment.