Revert back to rspec 3 beta1

adambeynon · adambeynon · commit 68d12ae7ab7b · 2014-06-04T10:11:09.000+01:00
diff --git a/Gemfile b/Gemfile
@@ -5,8 +5,8 @@ gem 'opal'
 
 gem 'rake'
 
-gem 'rspec',              '3.0.0.rc1'
-gem 'rspec-support',      '3.0.0.rc1'
-gem 'rspec-core',         '3.0.0.rc1'
-gem 'rspec-mocks',        '3.0.0.rc1'
-gem 'rspec-expectations', '3.0.0.rc1'
+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'
diff --git a/Rakefile b/Rakefile
@@ -19,6 +19,25 @@ task :sizes do
   puts "\ndevelopment: #{code.size}, minified: #{min.size}"
 end
 
+module Opal
+  module Nodes
+    class OpAsgn1Node
+      def compile_and
+        with_temp do |a| # args
+          with_temp do |r| # recv
+            aref = s(:call, s(:js_tmp, r), :[], s(:arglist, s(:js_tmp, a)))
+            aset = s(:call, s(:js_tmp, r), :[]=, s(:arglist, s(:js_tmp, a), rhs))
+            andop = s(:and, aref, aset)
+
+            push "(#{a} = ", expr(first_arg), ", #{r} = ", expr(lhs)
+            push ", ", expr(andop), ")"
+          end
+        end
+      end
+    end
+  end
+end
+
 def build_rspec
   Opal::Processor.dynamic_require_severity = :warning
   Opal.append_path 'app'
@@ -27,7 +46,7 @@ def build_rspec
   Opal.use_gem 'rspec-expectations'
 
   %w[time fileutils test/unit/assertions coderay optparse shellwords socket uri
-     drb/drb diff/lcs diff/lcs/hunk].each do |asset|
+     drb/drb diff/lcs diff/lcs/hunk minitest minitest/assertions minitest/unit].each do |asset|
     Opal::Processor.stub_file asset
   end
 
diff --git a/app/rspec-builder.rb b/app/rspec-builder.rb
@@ -18,22 +18,24 @@
 require 'rspec/core/memoized_helpers'
 require 'rspec/core/metadata'
 require 'rspec/core/pending'
+
 require 'rspec/core/formatters'
+require 'rspec/core/formatters/helpers'
+require 'rspec/core/formatters/base_formatter'
+require 'rspec/core/formatters/base_text_formatter'
 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'
-require 'rspec-expectations'
+require 'rspec/expectations'
 require 'rspec/mocks'
 
 # we want access to BaseFormatter
