opal · Jan 27, 2014 · Jan 27, 2014 · Jan 27, 2014
Showing with 42 additions and 6 deletions.

+3 −3 .travis.yml

+19 −3 opal/browser/history.rb

+19 −0 spec/history_spec.rb

+1 −0 spec/http_spec.rb
diff --git a/.travis.yml b/.travis.yml
@@ -16,9 +16,6 @@ env:
     - SELENIUM_BROWSER=firefox SELENIUM_VERSION=25
     - SELENIUM_BROWSER=firefox SELENIUM_VERSION=26
 
-    - SELENIUM_BROWSER=chrome SELENIUM_VERSION=30
-    - SELENIUM_BROWSER=chrome SELENIUM_VERSION=31
-
     - SELENIUM_BROWSER=safari SELENIUM_VERSION=5.1
     - SELENIUM_BROWSER=safari SELENIUM_VERSION=6.1
     - SELENIUM_BROWSER=safari SELENIUM_VERSION=7.0
@@ -33,6 +30,9 @@ env:
     - SELENIUM_BROWSER=ie SELENIUM_VERSION=10
     - SELENIUM_BROWSER=ie SELENIUM_VERSION=11
 
+    - SELENIUM_BROWSER=chrome SELENIUM_VERSION=30
+    - SELENIUM_BROWSER=chrome SELENIUM_VERSION=31
+
 matrix:
   allow_failures:
     # I know these fail

diff --git a/opal/browser/history.rb b/opal/browser/history.rb
@@ -6,8 +6,9 @@ module Browser
 #
 # @see https://developer.mozilla.org/en-US/docs/Web/API/History
 class History
+  # Check if HTML5 history is supported.
   def self.supported?
-    Browser.supports? :history
+    Browser.supports? 'History'
   end
 
   include Native
@@ -58,8 +59,23 @@ def current
 
   # @!attribute [r] state
   # @return [Object] the current state
-  def state
-    `#@native.state`
+  if Browser.supports? 'History.state'
+    def state
+      %x{
+        var state = #@native.state;
+
+        if (state == null) {
+          return nil;
+        }
+        else {
+          return state;
+        }
+      }
+    end
+  else
+    def state
+      raise NotImplementedError, 'history state unsupported'
+    end
   end
 end
 

diff --git a/spec/history_spec.rb b/spec/history_spec.rb
@@ -35,4 +35,23 @@
       $window.history.back
     end
   end
+
+  describe '#state' do
+    async 'gets the right state' do
+      $window.history.push('/wut', 42)
+      $window.history.state.should eq(42)
+      $window.history.push('/omg', 23)
+      $window.history.state.should eq(23)
+
+      $window.on 'pop:state' do |e|
+        run_async {
+          true.should eq(true)
+        }
+
+        e.off
+      end
+
+      $window.history.back(2)
+    end
+  end if Browser.supports? 'History.state'
 end if Browser::History.supported?
diff --git a/spec/http_spec.rb b/spec/http_spec.rb
@@ -1,3 +1,4 @@
+require 'spec_helper'
 require 'browser/http'
 
 describe Browser::HTTP do