working around wait_for_ajax in connection spec issue round 2, plus added preload regulated constant to policy mechanism

catmando · catmando · commit 1126ff29a566 · 2018-09-21T11:34:41.000-04:00
diff --git a/ruby/hyper-operation/Gemfile.lock b/ruby/hyper-operation/Gemfile.lock
@@ -23,7 +23,7 @@ PATH
   specs:
     hyper-spec (1.0.0.lap28)
       capybara
-      chromedriver-helper
+      chromedriver-helper (= 1.2.0)
       libv8 (~> 6.3.0)
       method_source
       mini_racer (~> 0.1.15)
@@ -122,7 +122,7 @@ GEM
       babel-source (>= 4.0, < 6)
       execjs (~> 2.0)
     builder (3.2.3)
-    capybara (3.7.2)
+    capybara (3.8.0)
       addressable
       mini_mime (>= 0.1.3)
       nokogiri (~> 1.8)
@@ -350,6 +350,7 @@ PLATFORMS
 
 DEPENDENCIES
   bundler
+  chromedriver-helper
   database_cleaner
   hyper-component!
   hyper-operation!
diff --git a/ruby/hyper-operation/lib/hyper-operation/transport/policy.rb b/ruby/hyper-operation/lib/hyper-operation/transport/policy.rb
@@ -3,6 +3,16 @@ module Hyperloop
   class InternalClassPolicy
 
     def initialize(regulated_klass)
+      unless regulated_klass.is_a?(Class)
+        # attempt to constantize the class in case eager_loading in production
+        # has loaded the policy before the class.  THis will insure that if
+        # there is a class being regulated, it is loaded first.
+        begin
+          regulated_klass.constantize
+        rescue NameError
+          nil
+        end
+      end
       @regulated_klass = regulated_klass
     end
 
diff --git a/ruby/hyper-operation/spec/hyper-operation/transports_spec.rb b/ruby/hyper-operation/spec/hyper-operation/transports_spec.rb
@@ -145,7 +145,7 @@ def connect(*args)
       Hyperloop.connect_session = true
       mount "TestComponent"
       evaluate_ruby "Hyperloop.go_ahead_and_connect"
-      wait_for_ajax
+      wait_for_ajax rescue nil
       evaluate_ruby "MyControllerOp.run(data: 'hello')"
       page.should have_content("hello")
     end
@@ -285,7 +285,7 @@ def connect(*args)
       mount "TestComponent"
       sleep 0.25
       evaluate_ruby "Hyperloop.go_ahead_and_connect"
-      wait_for_ajax
+      wait_for_ajax rescue nil
       evaluate_ruby "MyControllerOp.run(data: 'hello')"
       page.should have_content("hello")
     end
