opal · Oct 15, 2014 · Oct 15, 2014
Showing with 88 additions and 28 deletions.

+15 −0 .gitmodules

+5 −5 Gemfile

+16 −0 lib/opal/rspec.rb

+1 −23 opal/opal/rspec.rb

+46 −0 opal/opal/rspec/requires.rb

+1 −0 rspec

+1 −0 rspec-core

+1 −0 rspec-expectations

+1 −0 rspec-mocks

+1 −0 rspec-support
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,15 @@
+[submodule "rspec"]
+	path = rspec
+	url = https://github.com/rspec/rspec.git
+[submodule "rspec-support"]
+	path = rspec-support
+	url = https://github.com/rspec/rspec-support.git
+[submodule "rspec-core"]
+	path = rspec-core
+	url = https://github.com/rspec/rspec-core.git
+[submodule "rspec-mocks"]
+	path = rspec-mocks
+	url = https://github.com/rspec/rspec-mocks.git
+[submodule "rspec-expectations"]
+	path = rspec-expectations
+	url = https://github.com/rspec/rspec-expectations.git
diff --git a/Gemfile b/Gemfile
@@ -4,8 +4,8 @@ gemspec
 gem 'opal', github: 'opal/opal'
 # gem 'opal', path: '../opal'
 
-gem 'rspec',              '3.0.0.beta1'
-gem 'rspec-support',      '3.0.0.beta1'
-gem 'rspec-core',         '3.0.0.beta1'
-gem 'rspec-mocks',        '3.0.0.beta1'
-gem 'rspec-expectations', '3.0.0.beta1'
+gem 'rspec',              :path => 'rspec'
+gem 'rspec-support',      :path => 'rspec-support'
+gem 'rspec-core',         :path => 'rspec-core'
+gem 'rspec-mocks',        :path => 'rspec-mocks'
+gem 'rspec-expectations', :path => 'rspec-expectations'
diff --git a/lib/opal/rspec.rb b/lib/opal/rspec.rb
@@ -4,3 +4,19 @@
 # Just register our opal code path with opal build tools
 Opal.append_path File.expand_path('../../../opal', __FILE__)
 
+%w[rspec rspec-core rspec-expectations rspec-mocks rspec-support].each do |gem|
+  Opal.append_path File.expand_path("../../../#{gem}/lib", __FILE__)
+end
+
+::Opal::Processor.dynamic_require_severity = :warning
+Opal::Processor.stub_file "rspec/matchers/built_in/have"
+Opal::Processor.stub_file "diff/lcs"
+Opal::Processor.stub_file "diff/lcs/hunk"
+Opal::Processor.stub_file "fileutils"
+Opal::Processor.stub_file "test/unit/assertions"
+Opal::Processor.stub_file "coderay"
+Opal::Processor.stub_file "optparse"
+Opal::Processor.stub_file "shellwords"
+Opal::Processor.stub_file "socket"
+Opal::Processor.stub_file "uri"
+Opal::Processor.stub_file "drb/drb"
diff --git a/opal/opal/rspec.rb b/opal/opal/rspec.rb
@@ -4,29 +4,7 @@ class Unit; end
 
 Test = MiniTest
 
-require 'file'
-require 'corelib/dir'
-require 'thread'
-
-require 'set'
-require 'time'
-require 'rbconfig'
-require 'pathname'
-
-# vendor a pre-built rspec
-require 'opal/rspec/rspec'
-
-# we "fix" these files, so require them now so they are loaded before our
-# fixes file. We can't use Kernel#require() directly as the compiler will
-# complain it can't find these files at compile time, but they are available
-# from rspec.js from the gem.
-%w[rspec
-  rspec/core/formatters/base_text_formatter
-  rspec/core/formatters/html_printer
-  rspec/matchers/pretty
-  rspec/matchers/built_in/base_matcher
-  rspec/matchers/built_in/be].each { |r| `self.$require(r)` }
-
+require 'opal/rspec/requires'
 require 'opal/rspec/fixes'
 require 'opal/rspec/text_formatter'
 require 'opal/rspec/browser_formatter'

diff --git a/opal/opal/rspec/requires.rb b/opal/opal/rspec/requires.rb
@@ -0,0 +1,46 @@
+require 'file'
+require 'corelib/dir'
+require 'thread'
+
+require 'set'
+require 'time'
+require 'rbconfig'
+require 'pathname'
+
+# TODO: still needed? meh..
+require 'rspec/core/version'
+require 'rspec/core/flat_map'
+require 'rspec/core/filter_manager'
+require 'rspec/core/dsl'
+require 'rspec/core/reporter'
+require 'rspec/core/hooks'
+require 'rspec/core/memoized_helpers'
+require 'rspec/core/metadata'
+require 'rspec/core/pending'
+require 'rspec/core/formatters'
+require 'rspec/core/ordering'
+require 'rspec/core/world'
+require 'rspec/core/configuration'
+require 'rspec/core/option_parser'
+require 'rspec/core/configuration_options'
+require 'rspec/core/command_line'
+require 'rspec/core/runner'
+require 'rspec/core/example'
+require 'rspec/core/shared_example_group/collection'
+require 'rspec/core/shared_example_group'
+require 'rspec/core/example_group'
+
+require 'rspec/core/mocking/with_rspec'
+
+require 'rspec/support'
+require 'rspec/core'
+require 'rspec/expectations'
+require 'rspec/mocks'
+require 'rspec'
+
+# FIXME: still needed?
+require 'rspec/core/formatters/base_text_formatter'
+require 'rspec/core/formatters/html_printer'
+require 'rspec/matchers/pretty'
+require 'rspec/matchers/built_in/base_matcher'
+require 'rspec/matchers/built_in/be'
diff --git a/rspec b/rspec
diff --git a/rspec-core b/rspec-core
diff --git a/rspec-expectations b/rspec-expectations
diff --git a/rspec-mocks b/rspec-mocks
diff --git a/rspec-support b/rspec-support