Tidy up some specs

adambeynon · adambeynon · commit 915b9623de14 · 2014-10-15T22:16:48.000+01:00
diff --git a/opal/opal/spec/expectations.rb b/opal/opal/spec/expectations.rb
@@ -84,25 +84,26 @@ def failure_message_for_should_not
   end
 
   matcher :raise_error do
-    def initialize(&block)
-      @block = block
-    end
-
     def match expected, actual
+      @expected = expected || Exception
       ok = true
 
       begin
-        @block.call
+        actual.call
         ok = false
       rescue => e
-        @error = e
+        @expected = @error = e
       end
 
       ok
     end
 
     def failure_message_for_should
-      "expected #{actual} to be raised, but nothing was."
+      "expected #@expected to be raised, but nothing was."
+    end
+
+    def failure_message_for_should_not
+      "did not expect an error, but #{@expected.class} was raised"
     end
   end
 
diff --git a/opal/opal/spec/object.rb b/opal/opal/spec/object.rb
@@ -1,17 +1,17 @@
-class Object
-  def describe desc, &block
-    OpalSpec::Example.create desc, block
-  end
+def self.describe desc, &block
+  OpalSpec::Example.create(desc, block)
+end
 
-  def should matcher = nil
+class Object
+  def should(matcher = nil)
     if matcher
       matcher.positive_match? self
     else
       OpalSpec::PositiveOperatorMatcher.new self
     end
   end
 
-  def should_not matcher = nil
+  def should_not(matcher = nil)
     if matcher
       matcher.negative_match? self
     else
diff --git a/opal/opal/spec/spec.rb b/opal/opal/spec/spec.rb
@@ -30,11 +30,15 @@ def self.create(desc, block)
       group
     end
 
+    def self.describe(desc, &block)
+      OpalSpec::Example.create(desc, block)
+    end
+
     def self.description
       @parent ? "#{@parent.description} #{@desc}" : @desc
     end
 
-    def self.it desc, &block
+    def self.it(desc, &block)
       @examples << [desc, block]
     end
 
@@ -66,7 +70,7 @@ def self.after(type = nil, &block)
       @after_hooks << block
     end
 
-    def self.run runner
+    def self.run(runner)
       @runner = runner
       @runner.example_group_started self
 
@@ -82,16 +86,16 @@ def self.run_next_example
       end
     end
 
-    def self.example_started example
+    def self.example_started(example)
       @runner.example_started example
     end
 
-    def self.example_passed example
+    def self.example_passed(example)
       @runner.example_passed example
       run_next_example
     end
 
-    def self.example_failed example
+    def self.example_failed(example)
       @runner.example_failed example
       run_next_example
     end
@@ -106,7 +110,7 @@ def self.before_hooks
 
     attr_reader :example_group, :exception
 
-    def initialize info
+    def initialize(info)
       @description = info[0]
       @__block__ = info[1]
       @example_group = self.class
@@ -120,7 +124,7 @@ def async!
       @asynchronous = true
     end
 
-    def run runner
+    def run(runner)
       @runner = runner
       begin
         @example_group.example_started self
@@ -165,7 +169,7 @@ def run_after_hooks
       end
     end
 
-    def run_async(&block)
+    def async(&block)
       begin
         block.call
       rescue => e
@@ -177,8 +181,8 @@ def run_async(&block)
       finish_running
     end
 
-    def set_timeout(duration, &block)
-      `setTimeout(#{block}, #{duration})`
+    def delay(duration, &block)
+      `setTimeout(#{block}, #{duration * 1000})`
       self
     end
 
@@ -192,8 +196,12 @@ def initialize(value)
       @value = value
     end
 
-    def to(*args)
-      @value.should(*args)
+    def to(matcher = nil, &block)
+      unless matcher
+        raise ArgumentError, 'The expect syntax requires a matcher'
+      end
+
+      @value.should(matcher)
     end
 
     def to_not(*args)
diff --git a/spec/async_spec.rb b/spec/async_spec.rb
@@ -0,0 +1,24 @@
+describe 'Async helpers' do
+  let(:foo) { 100 }
+
+  before { @model = 200 }
+
+  async 'can run examples async' do
+    async { 1.should == 1 }
+  end
+
+  async 'can access let() and before() helpers' do
+    async {
+      foo.should eq(100)
+      @model.should eq(200)
+    }
+  end
+
+  async 'can finish running after a long delay' do
+    obj = [1, 2, 3, 4]
+
+    delay(1) {
+      async { obj.should == [1, 2, 3, 4] }
+    }
+  end
+end
diff --git a/spec/expect_spec.rb b/spec/expect_spec.rb
@@ -6,4 +6,10 @@
   it 'works with simple to_not matchers' do
     expect(1).to_not eq(2)
   end
+
+  it 'does not allow operator matchers' do
+    proc {
+      expect(2).to == 2
+    }.should raise_error
+  end
 end
diff --git a/spec/specs_spec.rb b/spec/specs_spec.rb
@@ -49,22 +49,6 @@
     false.should be_false
     nil.should be_nil
   end
-
-  async 'this should pass (in 0.1 second time)' do
-    set_timeout(100) do
-      run_async {
-        1.should == 1
-      }
-    end
-  end
-
-  async 'this should fail (in 0.1 second time)' do
-    set_timeout(100) do
-      run_async {
-        lambda { 1.should == 5 }.should raise_error(Exception)
-      }
-    end
-  end
 end
 
 describe "let" do
