Some cleanup

adambeynon · adambeynon · commit 5b4f6cd5c906 · 2014-10-15T12:46:26.000+01:00
diff --git a/opal/opal/rspec.rb b/opal/opal/rspec.rb
@@ -17,7 +17,6 @@ class Unit; end
 
   # Async helpers for specs
   config.include Opal::RSpec::AsyncHelpers
-  config.extend Opal::RSpec::AsyncDefinitions
 
   # Always support expect() and .should syntax (we should not do this really..)
   config.expect_with :rspec do |c|
diff --git a/opal/opal/rspec/async.rb b/opal/opal/rspec/async.rb
@@ -1,13 +1,17 @@
 module Opal
   module RSpec
-    module AsyncDefinitions
-      def async(desc, *args, &block)
-        options = ::RSpec::Core::Metadata.build_hash_from(args)
-        Opal::RSpec::AsyncExample.register(self, desc, options, block)
+    module AsyncHelpers
+      module ClassMethods
+        def async(desc, *args, &block)
+          options = ::RSpec::Core::Metadata.build_hash_from(args)
+          Opal::RSpec::AsyncExample.register(self, desc, options, block)
+        end
+      end
+
+      def self.included(base)
+        base.extend ClassMethods
       end
-    end
 
-    module AsyncHelpers
       def async(&block)
         @example.continue_async(block)
       end
diff --git a/spec/async_spec.rb b/spec/async_spec.rb
@@ -1,19 +1,18 @@
 describe "Asynchronous helpers" do
-
   let(:foo) { 100 }
 
   before do
     @model = Object.new
   end
 
   async "can run examples async" do
-    run_async do
+    async do
       1.should == 1
     end
   end
 
   async "can access let() helpers and before() helpers" do
-    run_async do
+    async do
       foo.should eq(100)
       @model.should be_kind_of(Object)
     end
@@ -23,7 +22,7 @@
     obj = [1, 2, 3, 4]
 
     delay(1) do
-      run_async { obj.should == [1, 2, 3, 4] }
+      async { obj.should == [1, 2, 3, 4] }
     end
   end
 
@@ -33,7 +32,7 @@
     }.to raise_error(Exception)
 
     delay(0) do
-      run_async { expect(42).to eq(42) }
+      async { expect(42).to eq(42) }
     end
   end
 end
