fixed issues from review discussion

shakacode · Mar 8, 2016 · 9621a16 · 9621a16
1 parent 40c97e2
commit 9621a16
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/node_package/src/ReactOnRails.js b/node_package/src/ReactOnRails.js
@@ -1,4 +1,4 @@
-import { reactOnRailsPageLoaded, clientStartup } from './clientStartup';
+import * as ClientStartup from './clientStartup';
 import handleError from './handleError';
 import ComponentRegistry from './ComponentRegistry';
 import StoreRegistry from './StoreRegistry';
@@ -61,7 +61,7 @@ ctx.ReactOnRails = {
   },
 
   reactOnRailsPageLoaded() {
-    reactOnRailsPageLoaded();
+    ClientStartup.reactOnRailsPageLoaded();
   },
 
   ////////////////////////////////////////////////////////////////////////////////
@@ -176,6 +176,6 @@ ctx.ReactOnRails = {
 
 ReactOnRails.resetOptions();
 
-clientStartup(ctx);
+ClientStartup.clientStartup(ctx);
 
 export default ctx.ReactOnRails;
diff --git a/spec/dummy/Gemfile.lock b/spec/dummy/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    react_on_rails (3.0.6)
+    react_on_rails (3.0.5)
       connection_pool
       execjs (~> 2.5)
       foreman
@@ -72,6 +72,9 @@ GEM
     capybara-screenshot (1.0.11)
       capybara (>= 1.0, < 3)
       launchy
+    capybara-webkit (1.8.0)
+      capybara (>= 2.3.0, < 2.7.0)
+      json
     childprocess (0.5.9)
       ffi (~> 1.0, >= 1.0.11)
     chromedriver-helper (1.0.0)
@@ -300,6 +303,7 @@ DEPENDENCIES
   bootstrap-sass
   capybara
   capybara-screenshot
+  capybara-webkit
   chromedriver-helper
   coffee-rails (~> 4.1.0)
   coveralls