opal-rspec 0.3.0.beta2 → 0.3.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5bd79540d6e74c4df7d716c4ca5b8f03cde5a6e
-  data.tar.gz: 723db13931f42a37a78ae3c2aecef9ef6eb17df2
+  metadata.gz: 84230cf1d8509f28c633e0e882d33c09f1246b24
+  data.tar.gz: aec3b03f1a636f28f306cac7fda0dc96a1315d93
 SHA512:
-  metadata.gz: 4072ac6a74fe502ca4c83b828934c5f88216d83ede42a03adf3e7cfad083ead45b8f624cb38671cc82912136746a6f8fbdf2475221aaa75d76276b0169ed3b12
-  data.tar.gz: 8256bba226056877123b8a50439d8eca2eeed995b4ba9b8eed3f34954a2bee31f544b9c86bd4ec79af1ca0ed76cdad96e41c5d5adc2f15d2c754ff98dbe2bdc9
+  metadata.gz: 9cdd2b63ace9e719b2c96af8e81120086c7840d5169b5691732bdd71b56b84731cfeb6d4a07abb4bd4ff6f6d4e984b802b00bdd7b0f66015e617a4041bc0d1ca
+  data.tar.gz: fa734e9b5618dc8d10944f253f6028d1e7850223b2919d44b32677bea6f53dbd42de1b04c09623bdd420958b1553148a1250642b36d1f4d099da1fb26ee12ea9

data/CHANGELOG.md

@@ -8,4 +8,6 @@
 
 *   Replaced browser formatter to use html printer from rspec
 
+*   Add timeout support to asynchronous specs
+
 ## 0.2.1 2013-11-24

data/lib/opal/rspec/version.rb

@@ -1,5 +1,5 @@
 module Opal
   module RSpec
-    VERSION = '0.3.0.beta2'
+    VERSION = '0.3.0.beta3'
   end
 end

data/opal/opal/rspec/async.rb

@@ -8,14 +8,18 @@ module Opal
     end
 
     module AsyncHelpers
-      def run_async(&block)
-        ::RSpec.current_example.continue_async(block)
+      def async(&block)
+        @example.continue_async(block)
       end
 
-      def set_timeout(duration, &block)
-        `setTimeout(block, duration)`
+      alias run_async async
+
+      def delay(duration, &block)
+        `setTimeout(block, duration * 1000)`
         self
       end
+
+      alias set_timeout delay
     end
 
     class AsyncRunner
@@ -70,14 +74,18 @@ module Opal
         @examples ||= []
       end
 
+      include AsyncHelpers
+
       def run(example_group_instance, reporter, &after_run_block)
         @example_group_instance = example_group_instance
-        @reporter = reporter
-        @after_run_block = after_run_block
+        @reporter               = reporter
+        @after_run_block        = after_run_block
+        @finished               = false
 
         should_wait = true
 
         ::RSpec.current_example = self
+        example_group_instance.instance_variable_set :@example, self
 
         start(reporter)
 
@@ -89,10 +97,21 @@ module Opal
           should_wait = false
         end
 
-        async_example_finished unless should_wait
+        if should_wait
+          delay options[:timeout] || 10 do
+            next if finished?
+
+            set_exception RuntimeError.new("timeout")
+            async_example_finished
+          end
+        else
+          async_example_finished
+        end
       end
 
       def continue_async(block)
+        return if finished?
+
         begin
           block.call
         rescue Exception => e
@@ -102,7 +121,13 @@ module Opal
         async_example_finished
       end
 
+      def finished?
+        @finished
+      end
+
       def async_example_finished
+        @finished = true
+
         begin
           run_after_each
         rescue Exception => e

data/spec/async_spec.rb

@@ -22,7 +22,7 @@ describe "Asynchronous helpers" do
   async "can finish running after a long delay" do
     obj = [1, 2, 3, 4]
 
-    set_timeout 100 do
+    delay(1) do
       run_async { obj.should == [1, 2, 3, 4] }
     end
   end
@@ -32,7 +32,7 @@ describe "Asynchronous helpers" do
       expect(:foo).to eq(:baz)
     }.to raise_error(Exception)
 
-    set_timeout(0) do
+    delay(0) do
       run_async { expect(42).to eq(42) }
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opal-rspec
 version: !ruby/object:Gem::Version
-  version: 0.3.0.beta2
+  version: 0.3.0.beta3
 platform: ruby
 authors:
 - Adam Beynon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-17 00:00:00.000000000 Z
+date: 2014-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal
@@ -100,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.9
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: RSpec for Opal