Migrate test setup to use new ‘react/react-source’

zetachang · zetachang · commit b68dac6307d4 · 2016-10-10T21:26:58.000+08:00
diff --git a/Rakefile b/Rakefile
@@ -9,15 +9,11 @@ ENV['REAL_BUNDLE_GEMFILE'] = ENV['BUNDLE_GEMFILE']
 require 'rspec/core/rake_task'
 require 'opal/rspec/rake_task'
 
-begin
-  require "react-rails"
-rescue NameError
-end
+require 'react/react-source'
 
 RSpec::Core::RakeTask.new('ruby:rspec')
 
 Opal::RSpec::RakeTask.new('opal:rspec') do |s, task|
-  s.append_path React::Rails::AssetVariant.new(addons: true).react_directory
   s.append_path 'spec/vendor'
   s.index_path = 'spec/index.html.erb'
   task.timeout = 80000 if task
diff --git a/config.ru b/config.ru
@@ -4,26 +4,21 @@ Bundler.require
 require "opal/rspec"
 require "opal-jquery"
 
-begin
-  require "react-rails"
-rescue NameError
-end
+require 'react/react-source'
 
 if Opal::RSpec.const_defined?("SprocketsEnvironment")
   sprockets_env = Opal::RSpec::SprocketsEnvironment.new
   sprockets_env.cache = Sprockets::Cache::FileStore.new("tmp")
   sprockets_env.add_spec_paths_to_sprockets
   run Opal::Server.new(sprockets: sprockets_env) { |s|
     s.main = 'opal/rspec/sprockets_runner'
-    s.append_path React::Rails::AssetVariant.new(addons: true).react_directory
     s.debug = false
     s.append_path 'spec/vendor'
     s.index_path = 'spec/index.html.erb'
   }
 else
   run Opal::Server.new { |s|
     s.main = 'opal/rspec/sprockets_runner'
-    s.append_path React::Rails::AssetVariant.new(addons: true).react_directory
     s.append_path 'spec'
     s.append_path 'spec/vendor'
     s.debug = false
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -15,8 +15,7 @@ def ruby?
 
 if RUBY_ENGINE == 'opal'
   require File.expand_path('../vendor/jquery-2.2.4.min', __FILE__)
-  require 'react.js'
-  require "react-server.js"
+  require 'react/react-source'
   require 'reactive-ruby'
   require 'react/test/rspec'
 
