Fix test when react-server might not exist

zetachang · zetachang · commit 66bb929df803 · 2016-12-12T08:29:30.000+08:00
diff --git a/lib/generators/reactive_ruby/test_app/templates/assets/javascripts/components.rb b/lib/generators/reactive_ruby/test_app/templates/assets/javascripts/components.rb
@@ -1,4 +1,3 @@
 require 'opal'
-require 'react-server.js'
 require 'hyper-react'
 require_tree './components'
diff --git a/spec/reactive-ruby/component_loader_spec.rb b/spec/reactive-ruby/component_loader_spec.rb
@@ -3,14 +3,21 @@
 if ruby?
 RSpec.describe ReactiveRuby::ComponentLoader do
   GLOBAL_WRAPPER = <<-JS
-    var global = global || this;
-    var self = self || this;
+    #{React::ServerRendering::ExecJSRenderer::GLOBAL_WRAPPER}
     var console = {
       warn: function(s) {  }
     };
   JS
 
-  let(:js) { ::Rails.application.assets['components'].to_s }
+  let(:js) do
+    if ::Rails.application.assets['react-server.js'] &&
+       !::Rails.application.assets['react-server.js'].to_s.start_with?("// A placeholder file")
+      react_source = ::Rails.application.assets['react-server.js']
+    else
+      react_source = ::Rails.application.assets['react.js']
+    end
+    ::Rails.application.assets['components'].to_s + react_source.to_s
+  end
   let(:context) { ExecJS.compile(GLOBAL_WRAPPER + js) }
   let(:v8_context) { ReactiveRuby::ServerRendering.context_instance_for(context) }
 
diff --git a/spec/reactive-ruby/isomorphic_helpers_spec.rb b/spec/reactive-ruby/isomorphic_helpers_spec.rb
@@ -77,7 +77,12 @@ def test_context(files = nil)
     end
 
     def react_context
-      test_context('components')
+      if ::Rails.application.assets['react-server.js'] &&
+         !::Rails.application.assets['react-server.js'].to_s.start_with?("// A placeholder file")
+        test_context(['components', 'react-server.js'])
+      else
+        test_context(['components', 'react.js'])
+      end
     end
 
     let(:v8_context) { TestV8Context.new }
