opal-browser 0.1.0.beta1 → 0.2.0.beta1

data/spec/dom/document_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Browser::DOM::Document do
   describe '#title' do
     it 'should get the document title' do
-      $document.title.should be_kind_of(String)
+      expect($document.title).to be_a(String)
     end
   end
 
@@ -11,7 +11,7 @@ describe Browser::DOM::Document do
     it 'should set the document title' do
       old = $document.title
       $document.title = 'lol'
-      $document.title.should == 'lol'
+      expect($document.title).to eq('lol')
       $document.title = old
     end
   end
@@ -22,19 +22,19 @@ describe Browser::DOM::Document do
     HTML
 
     it "should get element by id" do
-      $document["lol"].should == `#{$document.to_n}.getElementById('lol')`
+      expect($document["lol"]).to eq(`document.getElementById('lol')`)
     end
 
     it "should get element by css" do
-      $document["lol"].should == `#{$document.to_n}.getElementById('lol')`
+      expect($document["#lol"]).to eq(`document.getElementById('lol')`)
     end
 
     it "should get element by xpath" do
-      $document["//*[@id='lol']"].should == `#{$document.to_n}.getElementById('lol')`
+      expect($document["//*[@id='lol']"]).to eq(`document.getElementById('lol')`)
     end
 
     it "should return nil if it can't find anything" do
-      $document["doo-dah"].should be_nil
+      expect($document["doo-dah"]).to be_nil
     end
   end
 end

data/spec/dom/element_spec.rb

@@ -7,7 +7,7 @@ describe Browser::DOM::Element do
     HTML
 
     it 'gets the proper id' do
-      $document["lol"].id.should == 'lol'
+      expect($document["lol"].id).to eq('lol')
     end
   end
 
@@ -20,11 +20,11 @@ describe Browser::DOM::Element do
     HTML
 
     it 'gives an empty array when no class is set' do
-      $document["class-names-2"].class_names.should == []
+      expect($document["class-names-2"].class_names).to eq([])
     end
 
     it 'gives an array of class names' do
-      $document["class-names-1"].class_names.should == %w[a b c]
+      expect($document["class-names-1"].class_names).to eq(%w[a b c])
     end
   end
 
@@ -36,11 +36,11 @@ describe Browser::DOM::Element do
     HTML
 
     it 'matches on class and id' do
-      $document[:matches].matches?('#matches.not.me').should be_truthy
+      expect($document[:matches].matches?('#matches.not.me')).to be_truthy
     end
 
     it 'matches on class and name' do
-      $document[:matches].first_element_child.matches?('span.yes').should be_truthy
+      expect($document[:matches].first_element_child.matches?('span.yes')).to be_truthy
     end
   end
 end

data/spec/dom/event_spec.rb

@@ -16,13 +16,13 @@ describe Browser::DOM::Event do
         count += 1
       end
 
-      count.should == 0
+      expect(count).to eq(0)
       elem.trigger :click
-      count.should == 1
+      expect(count).to eq(1)
       elem.trigger :click
-      count.should == 2
+      expect(count).to eq(2)
       elem.trigger 'mouse:down'
-      count.should == 2
+      expect(count).to eq(2)
     end
 
     it "listens for custom events" do
@@ -33,19 +33,19 @@ describe Browser::DOM::Event do
         count += 1
       end
 
-      count.should == 0
+      expect(count).to eq(0)
       elem.trigger :huehue
-      count.should == 1
+      expect(count).to eq(1)
       elem.trigger :huehue
-      count.should == 2
+      expect(count).to eq(2)
     end
 
     async "passes an event to the handler" do
       elem = $document["event-spec"]
 
       elem.on :click do |event|
-        run_async {
-          event.should be_kind_of Browser::DOM::Event
+        async {
+          expect(event).to be_a(Browser::DOM::Event)
         }
       end
 
@@ -56,22 +56,22 @@ describe Browser::DOM::Event do
       elem = $document["event-spec"]
 
       elem.on :bazinga do |event, foo, bar, baz|
-        run_async {
-          foo.should == 1
-          bar.should == 2
-          baz.should == 3
+        async {
+          expect(foo).to eq(1)
+          expect(bar).to eq(2)
+          expect(baz).to eq(3)
         }
       end
 
       elem.trigger :bazinga, 1, 2, 3
     end
 
-    async "works with deferred elements" do
+    async "works with delegated events" do
       elem = $document["event-spec"]
 
       elem.on :bazinga, 'span.nami' do
-        run_async {
-          true.should be_truthy
+        async {
+          expect(true).to be_truthy
         }
       end
 
@@ -97,11 +97,11 @@ describe Browser::DOM::Event do
       end
 
       elem.trigger :click
-      count.should == 2
+      expect(count).to eq(2)
 
       elem.off :click
       elem.trigger :click
-      count.should == 2
+      expect(count).to eq(2)
     end
 
     it "removes only the passed handler" do
@@ -117,11 +117,11 @@ describe Browser::DOM::Event do
       end
 
       elem.trigger :click
-      count.should == 2
+      expect(count).to eq(2)
 
       cb.off
       elem.trigger :click
-      count.should == 3
+      expect(count).to eq(3)
     end
   end
 end

data/spec/dom/mutation_observer_spec.rb

@@ -9,8 +9,8 @@ describe Browser::DOM::MutationObserver do
 
   async 'notifies additions' do
     obs = Browser::DOM::MutationObserver.new {|mutations|
-      run_async {
-        mutations.first.added.first.name.should == 'DIV'
+      async {
+        expect(mutations.first.added.first.name).to eq('DIV')
       }
 
       obs.disconnect
@@ -23,8 +23,8 @@ describe Browser::DOM::MutationObserver do
 
   async 'notifies removals' do
     obs = Browser::DOM::MutationObserver.new {|mutations|
-      run_async {
-        mutations.first.removed.first.name.should == 'SPAN'
+      async {
+        expect(mutations.first.removed.first.name).to eq('SPAN')
       }
 
       obs.disconnect
@@ -34,4 +34,4 @@ describe Browser::DOM::MutationObserver do
 
     $document[:mutate].first_element_child.remove
   end
-end
+end if Browser::DOM::MutationObserver.supported?

data/spec/dom/node_spec.rb

@@ -5,22 +5,22 @@ describe Browser::DOM::Node do
     html '<div id="lol"></div>'
 
     it 'should work when the other argument is the native counterpart' do
-      $document["lol"].should == `document.getElementById("lol")`
+      expect($document["lol"]).to eq(`document.getElementById("lol")`)
     end
 
     it 'should work when the other argument is the same DOM::Node' do
       el = $document["lol"]
-      el.should == el
+      expect(el).to eq(el)
     end
 
     it 'should work when the other argument is another DOM::Node' do
-      $document["lol"].should == $document["lol"]
+      expect($document["lol"]).to eq($document["lol"])
     end
   end
 
   describe "#document?" do
     it "should be true for document" do
-      $document.document?.should be_truthy
+      expect($document.document?).to be_truthy
     end
   end
 
@@ -28,7 +28,7 @@ describe Browser::DOM::Node do
     html '<div id="lol"></div>'
 
     it "should be true for <div id='lol'>" do
-      $document["#lol"].element?.should be_truthy
+      expect($document["#lol"].element?).to be_truthy
     end
   end
 
@@ -36,7 +36,7 @@ describe Browser::DOM::Node do
     html '<div id="omg">lol</div>'
 
     it "should be true for the first child of <div id='lol'>" do
-      $document["#omg"].child.text?.should be_truthy
+      expect($document["#omg"].child.text?).to be_truthy
     end
   end
 
@@ -48,13 +48,13 @@ describe Browser::DOM::Node do
     it 'should get all ancestors' do
       ancestors = $document["incest"].ancestors
 
-      ancestors[0].name.should == 'STRONG'
-      ancestors[1].name.should == 'SPAN'
-      ancestors[2].name.should == 'DIV'
+      expect(ancestors[0].name).to eq('STRONG')
+      expect(ancestors[1].name).to eq('SPAN')
+      expect(ancestors[2].name).to eq('DIV')
     end
 
     it 'should get only the selected ancestors' do
-      $document["incest"].ancestors('strong').length.should == 1
+      expect($document["incest"].ancestors('strong').length).to eq(1)
     end
   end
 
@@ -64,81 +64,93 @@ describe Browser::DOM::Node do
     HTML
 
     it 'gets the first child properly' do
-      $document["test-1"].child.id.should == "test-2"
+      expect($document["test-1"].child.id).to eq('test-2')
     end
 
     it 'returns nil if there is no child' do
-      $document["test-2"].child.should be_nil
+      expect($document["test-2"].child).to be_nil
     end
   end
 
   describe '#next' do
     html <<-HTML
       <div id="spec-1"></div>
+      a
       <div id="spec-2"></div>
+      b
       <div id="spec-3"></div>
+      c
     HTML
 
     it 'should return the next sibling' do
-      $document["spec-1"].next.text?.should be_truthy
-      $document["spec-1"].next.next.id.should == 'spec-2'
+      expect($document["spec-1"].next.text?).to be_truthy
+      expect($document["spec-1"].next.next.id).to eq('spec-2')
     end
 
     it 'should return nil when there is no next sibling' do
-      $document["spec-3"].next.text?.should be_truthy
-      $document["spec-3"].next.next.should be_nil
+      expect($document["spec-3"].next.text?).to be_truthy
+      expect($document["spec-3"].next.next).to be_nil
     end
   end
 
   describe '#next_element' do
     html <<-HTML
       <div id="spec-1"></div>
+      a
       <div id="spec-2"></div>
+      b
       <div id="spec-3"></div>
+      c
     HTML
 
     it 'should return the next element sibling' do
-      $document["spec-1"].next_element.id.should == 'spec-2'
-      $document["spec-2"].next_element.id.should == 'spec-3'
+      expect($document["spec-1"].next_element.id).to eq('spec-2')
+      expect($document["spec-2"].next_element.id).to eq('spec-3')
     end
 
     it 'should return nil when there is no next element sibling' do
-      $document["spec-3"].next_element.should be_nil
+      expect($document["spec-3"].next_element).to be_nil
     end
   end
 
   describe '#previous' do
     html <<-HTML
+      a
       <div id="spec-1"></div>
+      b
       <div id="spec-2"></div>
+      c
       <div id="spec-3"></div>
     HTML
 
     it 'should return the previous sibling' do
-      $document["spec-2"].previous.text?.should be_truthy
-      $document["spec-2"].previous.previous.id.should == 'spec-1'
+      expect($document["spec-2"].previous.text?).to be_truthy
+      expect($document["spec-2"].previous.previous.id).to eq('spec-1')
     end
 
     it 'should return nil when there is no previous sibling' do
-      $document["spec-1"].previous.text?.should be_truthy
-      $document["spec-1"].previous.previous.should be_nil
+      expect($document["spec-1"].previous.text?).to be_truthy
+      expect($document["spec-1"].previous.previous).to be_nil
     end
   end
 
   describe '#previous_element' do
     html <<-HTML
+      a
       <div id="spec-1"></div>
+      b
       <div id="spec-2"></div>
+      c
       <div id="spec-3"></div>
     HTML
 
     it 'should return the previous element sibling' do
-      $document["spec-2"].previous_element.id.should == 'spec-1'
-      $document["spec-3"].previous_element.id.should == 'spec-2'
+      expect($document["spec-2"].previous_element.id).to eq('spec-1')
+      expect($document["spec-3"].previous_element.id).to eq('spec-2')
     end
 
     it 'should return nil when there is no previous element sibling' do
-      $document["spec-1"].previous_element.should be_nil
+      expect($document["spec-1"].previous_element).to be_nil
     end
   end
 
@@ -148,7 +160,7 @@ describe Browser::DOM::Node do
     HTML
 
     it 'should get the whole text for elements' do
-      $document["inner"].inner_text.should == "I like trains. And turtles."
+      expect($document["inner"].inner_text).to eq('I like trains. And turtles.')
     end
   end
 end

data/spec/dom_spec.rb

@@ -1,13 +1,15 @@
 require 'spec_helper'
 
-describe Browser::DOM do
-  html <<-HTML
-    <div class="spec"></div>
-    <div class="sock"></div>
-  HTML
+describe 'Kernel' do
+  describe '.DOM()' do
+    html <<-HTML
+      <div class="spec"></div>
+      <div class="sock"></div>
+    HTML
 
-  it "parses the HTML" do
-    $document['.spec'].element?.should be_truthy
-    $document['.sock'].element?.should be_truthy
+    it "parses HTML" do
+      expect($document['.spec'].element?).to be_truthy
+      expect($document['.sock'].element?).to be_truthy
+    end
   end
 end

data/spec/event_source_spec.rb

@@ -5,11 +5,11 @@ describe Browser::EventSource do
   async 'creates it' do
     Browser::EventSource.new '/events' do |es|
       es.on :open do |e|
-        run_async {
-          e.target.should be_kind_of Browser::EventSource
-        }
-
         es.close
+
+        async {
+          expect(e.target).to be_a(Browser::EventSource)
+        }
       end
     end
   end
@@ -17,12 +17,12 @@ describe Browser::EventSource do
   async 'receives an unnamed event' do
     Browser::EventSource.new '/events' do |es|
       es.on :message do |e|
-        run_async {
-          e.data.should == 'lol'
-        }
-
         e.off
         es.close
+
+        async {
+          expect(e.data).to eq('lol')
+        }
       end
     end
   end
@@ -30,12 +30,12 @@ describe Browser::EventSource do
   async 'receives a named event' do
     Browser::EventSource.new '/events' do |es|
       es.on :custom do |e|
-        run_async {
-          e.data.should == 'omg'
-        }
-
         e.off
         es.close
+
+        async {
+          expect(e.data).to eq('omg')
+        }
       end
     end
   end