opal 1.4.0.alpha1 → 1.5.0.rc1

data/spec/filters/bugs/time.rb

@@ -25,7 +25,6 @@ opal_filter "Time" do
   fails "Time#getlocal with a timezone argument subject's class implements .find_timezone method does not call .find_timezone if passed any not string/numeric/timezone timezone argument" # Expected TypeError (/can't convert \w+ into an exact number/) but got: NoMethodError (undefined method `getlocal' for 2000-01-01 12:00:00 UTC)
   fails "Time#gmtime converts self to UTC, modifying the receiver" # Expected 2007-01-09 03:00:00 UTC to equal 2007-01-09 12:00:00 UTC
   fails "Time#hash returns an Integer" # Expected "Time:100000" (String) to be an instance of Integer
-  fails "Time#inspect formats the fixed offset time following the pattern 'yyyy-MM-dd HH:mm:ss +/-HHMM'"
   fails "Time#inspect omits trailing zeros from microseconds" # Expected "2007-11-01 15:25:00 UTC" == "2007-11-01 15:25:00.1 UTC" to be truthy but was false
   fails "Time#inspect preserves microseconds" # Expected "2007-11-01 15:25:00 UTC" == "2007-11-01 15:25:00.123456 UTC" to be truthy but was false
   fails "Time#inspect preserves nanoseconds" # Expected "2007-11-01 15:25:00 UTC" == "2007-11-01 15:25:00.123456789 UTC" to be truthy but was false
@@ -44,7 +43,6 @@ opal_filter "Time" do
   fails "Time#strftime should be able to show default Logger format" # Expected "2001-12-03T04:05:06.000000 " == "2001-12-03T04:05:06.100000 " to be truthy but was false
   fails "Time#strftime should be able to show the commercial week day"
   fails "Time#strftime should be able to show the number of seconds since the unix epoch" # fails under FIJI et al TZs
-  fails "Time#strftime should be able to show the timezone if available"
   fails "Time#strftime should be able to show the timezone of the date with a : separator"
   fails "Time#strftime should be able to show the week number with the week starting on Sunday (%U) and Monday (%W)"
   fails "Time#strftime with %N formats the microseconds of the second with %6N"
@@ -53,9 +51,13 @@ opal_filter "Time" do
   fails "Time#strftime with %N formats the nanoseconds of the second with %N"
   fails "Time#strftime with %N formats the picoseconds of the second with %12N"
   fails "Time#subsec returns 0 as an Integer for a Time with a whole number of seconds" # NoMethodError: undefined method `subsec' for 1970-01-01 01:01:40 +0100
+  fails "Time#to_date yields accurate julian date for Julian-Gregorian gap value" # Expected 2299170 == 2299160 to be truthy but was false
+  fails "Time#to_date yields accurate julian date for ambiguous pre-Gregorian reform value" # Expected 2299160 == 2299150 to be truthy but was false
+  fails "Time#to_date yields accurate julian date for post-Gregorian reform value" # Expected 2299171 == 2299161 to be truthy but was false
+  fails "Time#to_date yields same julian day regardless of UTC time value" # Expected 2299171 == 2299161 to be truthy but was false
+  fails "Time#to_date yields same julian day regardless of local time or zone" # Expected 2299171 == 2299161 to be truthy but was false
   fails "Time#to_f returns the float number of seconds + usecs since the epoch"
   fails "Time#to_i rounds fractional seconds toward zero" # Expected -315619200 == -315619199 to be truthy but was false
-  fails "Time#to_s formats the fixed offset time following the pattern 'yyyy-MM-dd HH:mm:ss +/-HHMM'"
   fails "Time#tv_sec rounds fractional seconds toward zero" # Expected -315619200 == -315619199 to be truthy but was false
   fails "Time#usec returns a positive value for dates before the epoch" # Expected 0 to equal 404240
   fails "Time#utc converts self to UTC, modifying the receiver" # Expected 2007-01-09 03:00:00 UTC to equal 2007-01-09 12:00:00 UTC
@@ -77,6 +79,7 @@ opal_filter "Time" do
   fails "Time.at passed non-Time, non-Numeric with an argument that responds to #to_r needs for the argument to respond to #to_int too" # Mock 'rational-but-no-to_int' expected to receive to_r("any_args") exactly 1 times but received it 0 times
   fails "Time.gm handles fractional usec close to rounding limit" # NoMethodError: undefined method `nsec' for 2000-01-01 12:30:00 UTC:Time
   fails "Time.gm raises an ArgumentError for out of range microsecond" # Expected ArgumentError but no exception was raised (2000-01-01 20:15:01 UTC was returned)
+  fails "Time.httpdate parses RFC-2616 strings" # NoMethodError: undefined method `httpdate' for Time
   fails "Time.local raises an ArgumentError for out of range microsecond" # Expected ArgumentError but no exception was raised (2000-01-01 20:15:01 +0200 was returned)
   fails "Time.mktime raises an ArgumentError for out of range microsecond" # Expected ArgumentError but no exception was raised (2000-01-01 20:15:01 +0200 was returned)
   fails "Time.new has at least microsecond precision" # NoMethodError: undefined method `nsec' for 2019-05-16 23:25:01 +0200
@@ -85,12 +88,12 @@ opal_filter "Time" do
   fails "Time.new with a timezone argument #name method uses the optional #name method for marshaling" # ArgumentError: Opal does not support explicitly specifying UTC offset for Time
   fails "Time.new with a timezone argument Time-like argument of #utc_to_local and #local_to_utc methods has attribute values the same as a Time object in UTC" # ArgumentError: Opal does not support explicitly specifying UTC offset for Time
   fails "Time.new with a timezone argument Time-like argument of #utc_to_local and #local_to_utc methods implements subset of Time methods" # ArgumentError: Opal does not support explicitly specifying UTC offset for Time
-  fails "Time.new with a timezone argument accepts timezone argument that must have #local_to_utc and #utc_to_local methods" # Expected to not get Exception but got: ArgumentError (Opal does not support explicitly specifying UTC offset for Time)
-  fails "Time.new with a timezone argument does not raise exception if timezone does not implement #utc_to_local method" # Expected to not get Exception but got: ArgumentError (Opal does not support explicitly specifying UTC offset for Time)
+  fails "Time.new with a timezone argument accepts timezone argument that must have #local_to_utc and #utc_to_local methods" # Expected to not get Exception but got: ArgumentError (Opal doesn't support other types for a timezone argument than Integer and String)
+  fails "Time.new with a timezone argument does not raise exception if timezone does not implement #utc_to_local method" # Expected to not get Exception but got: ArgumentError (Opal doesn't support other types for a timezone argument than Integer and String)
   fails "Time.new with a timezone argument raises TypeError if timezone does not implement #local_to_utc method" # Expected TypeError (/can't convert \w+ into an exact number/) but got: ArgumentError (Opal does not support explicitly specifying UTC offset for Time)
-  fails "Time.new with a timezone argument returned value by #utc_to_local and #local_to_utc methods could be Time instance" # Expected to not get Exception but got: ArgumentError (Opal does not support explicitly specifying UTC offset for Time)
-  fails "Time.new with a timezone argument returned value by #utc_to_local and #local_to_utc methods could be Time subclass instance" # Expected to not get Exception but got: ArgumentError (Opal does not support explicitly specifying UTC offset for Time)
-  fails "Time.new with a timezone argument returned value by #utc_to_local and #local_to_utc methods could be any object with #to_i method" # Expected to not get Exception but got: ArgumentError (Opal does not support explicitly specifying UTC offset for Time)
+  fails "Time.new with a timezone argument returned value by #utc_to_local and #local_to_utc methods could be Time instance" # Expected to not get Exception but got: ArgumentError (Opal doesn't support other types for a timezone argument than Integer and String)
+  fails "Time.new with a timezone argument returned value by #utc_to_local and #local_to_utc methods could be Time subclass instance" # Expected to not get Exception but got: ArgumentError (Opal doesn't support other types for a timezone argument than Integer and String)
+  fails "Time.new with a timezone argument returned value by #utc_to_local and #local_to_utc methods could be any object with #to_i method" # Expected to not get Exception but got: ArgumentError (Opal doesn't support other types for a timezone argument than Integer and String)
   fails "Time.new with a timezone argument returned value by #utc_to_local and #local_to_utc methods could have any #zone and #utc_offset because they are ignored" # ArgumentError: Opal does not support explicitly specifying UTC offset for Time
   fails "Time.new with a timezone argument returned value by #utc_to_local and #local_to_utc methods leads to raising Argument error if difference between argument and result is too large" # Expected ArgumentError (utc_offset out of range) but got: ArgumentError (Opal does not support explicitly specifying UTC offset for Time)
   fails "Time.new with a timezone argument returns a Time in the timezone" # ArgumentError: Opal does not support explicitly specifying UTC offset for Time
@@ -98,10 +101,17 @@ opal_filter "Time" do
   fails "Time.new with a timezone argument subject's class implements .find_timezone method calls .find_timezone to build a time object if passed zone name as a timezone argument" # ArgumentError: Opal does not support explicitly specifying UTC offset for Time
   fails "Time.new with a timezone argument subject's class implements .find_timezone method does not call .find_timezone if passed any not string/numeric/timezone timezone argument" # Expected TypeError (/can't convert \w+ into an exact number/) but got: ArgumentError (Opal does not support explicitly specifying UTC offset for Time)
   fails "Time.new with a timezone argument the #abbr method is used by '%Z' in #strftime" # ArgumentError: Opal does not support explicitly specifying UTC offset for Time
+  fails "Time.new with a utc_offset argument raises ArgumentError if the String argument is not in an ASCII-compatible encoding" # Expected ArgumentError but no exception was raised (1999-12-31 18:50:00 -0410.000000000000028 was returned)
   fails "Time.new with a utc_offset argument raises ArgumentError if the month is greater than 12" # Expected ArgumentError (/(mon|argument) out of range/) but got: ArgumentError (Opal does not support explicitly specifying UTC offset for Time)
+  fails "Time.new with a utc_offset argument raises ArgumentError if the utc_offset argument is greater than or equal to 10e9" # Expected ArgumentError but no exception was raised (2031-09-09 00:46:40 +27777746.66666666418314 was returned)
   fails "Time.new with a utc_offset argument returns a Time with a UTC offset specified as +HH:MM:SS" # ArgumentError: Opal does not support explicitly specifying UTC offset for Time
   fails "Time.now has at least microsecond precision" # NoMethodError: undefined method `nsec' for 2019-05-16 23:25:03 +0200
   fails "Time.now uses the local timezone" # Expected 10800 to equal -28800
+  fails "Time.rfc2822 parses RFC-2822 strings" # NoMethodError: undefined method `rfc2822' for Time
+  fails "Time.rfc2822 parses RFC-822 strings" # NoMethodError: undefined method `rfc2822' for Time
+  fails "Time.rfc822 parses RFC-2822 strings" # NoMethodError: undefined method `rfc2822' for Time
+  fails "Time.rfc822 parses RFC-822 strings" # NoMethodError: undefined method `rfc2822' for Time
   fails "Time.utc handles fractional usec close to rounding limit" # NoMethodError: undefined method `nsec' for 2000-01-01 12:30:00 UTC:Time
   fails "Time.utc raises an ArgumentError for out of range microsecond" # Expected ArgumentError but no exception was raised (2000-01-01 20:15:01 UTC was returned)
+  fails "Time.xmlschema parses ISO-8601 strings" # NoMethodError: undefined method `xmlschema' for Time
 end

data/spec/lib/cli_spec.rb

@@ -84,7 +84,7 @@ RSpec.describe Opal::CLI do
     context 'when false' do
       let(:options) { {lib_only: false, runner: :compiler, evals: [''], skip_opal_require: true, no_exit: true} }
       it 'appends an empty code block at the end of the source' do
-        expect_output_of{ subject.run }.to include("function(Opal)")
+        expect_output_of{ subject.run }.to include("Opal.nil")
       end
     end
 
@@ -207,7 +207,7 @@ RSpec.describe Opal::CLI do
   describe ':sexp option' do
     let(:options) { {evals: ['puts 4'], sexp: true} }
     it 'prints syntax expressions for the given code' do
-      expect_output_of{ subject.run }.to eq("s(:send, nil, :puts,\n  s(:int, 4))\n")
+      expect_output_of{ subject.run }.to eq("s(:top,\n  s(:send, nil, :puts,\n    s(:int, 4)))\n")
     end
   end
 

data/spec/lib/compiler_spec.rb

@@ -17,15 +17,15 @@ RSpec.describe Opal::Compiler do
 
   describe 'requirable' do
     it 'executes the file' do
-      expect_compiled("").to include('(function(Opal) {')
-      expect_compiled("").to start_with('Opal.queue(function(Opal) {')
-      expect_compiled("").to end_with("});\n")
+      expect_compiled("true").to include('(function(Opal) {')
+      expect_compiled("true").to start_with('Opal.queue(function(Opal) {')
+      expect_compiled("true").to end_with("});\n")
     end
 
     it 'puts the compiled into "Opal.modules"' do
       options = { :requirable => true, :file => "pippo" }
-      expect_compiled("", options).to include('Opal.modules["pippo"] = function(Opal) {')
-      expect_compiled("", options).to end_with("};\n")
+      expect_compiled("true", options).to include('Opal.modules["pippo"] = function(Opal) {')
+      expect_compiled("true", options).to end_with("};\n")
     end
   end
 
@@ -89,18 +89,18 @@ RSpec.describe Opal::Compiler do
 
   describe "method names" do
     it "generates a named function for method" do
-      expect_compiled("def test_method; end").to include("function $$test_method()")
+      expect_compiled("def test_method; []; end").to include("function $$test_method()")
     end
 
     context "when function name is reserved" do
       it "generates a valid named function for method" do
-        expect_compiled("def Array; end").to include("function $$Array()")
+        expect_compiled("def Array; []; end").to include("function $$Array()")
       end
     end
 
     context "when function name is not valid" do
       it "generates a name in a safe way" do
-        expect_compiled("def test_method?; end").to include("function $test_method$ques$1()")
+        expect_compiled("def test_method?; []; end").to include("function $test_method$ques$1()")
       end
     end
   end

data/spec/lib/rewriters/base_spec.rb

@@ -6,7 +6,7 @@ RSpec.describe Opal::Rewriters::Base do
   include RewritersHelper
 
   def body_ast_of(method_source)
-    def_ast = parse_without_rewriting(method_source)
+    def_ast = parse_without_rewriting(method_source).children.first
     _, _, body_ast = *def_ast
     body_ast
   end

data/spec/lib/rewriters/binary_operator_assignment_spec.rb

@@ -1,71 +1,46 @@
 require 'lib/spec_helper'
+require 'support/rewriters_helper'
 
 RSpec.describe Opal::Rewriters::BinaryOperatorAssignment do
-  def s(type, *children)
-    ::Opal::AST::Node.new(type, children)
-  end
-
-  let(:rewriter) { Opal::Rewriters::BinaryOperatorAssignment.new }
+  include RewritersHelper
 
-  def parse(source)
-    parser = Opal::Parser.default_parser
-    buffer = ::Opal::Parser::SourceBuffer.new('(eval)')
-    buffer.source = source
-    parser.parse(buffer)
-  end
-
-  def rewrite(ast)
-    rewriter.process(ast)
-  end
+  use_only_described_rewriter!
 
-  around(:each) do |e|
-    Opal::Rewriters::BinaryOperatorAssignment.reset_tmp_counter!
-    Opal::Rewriter.disable { e.run }
-  end
+  before(:each) { Opal::Rewriters::BinaryOperatorAssignment.reset_tmp_counter! }
   let(:cache_tmp_name) { :$binary_op_recvr_tmp_1 }
   let(:cached) { s(:js_tmp, cache_tmp_name) }
 
-  shared_examples 'it rewrites' do |from, to|
-    it "rewrites #{from.inspect} to #{to.inspect}" do
-      input = parse(from)
-      rewritten = rewrite(input)
-      expected = parse(to)
-
-      expect(rewritten).to eq(expected)
-    end
-  end
-
   context 'rewriting or_asgn and and_asgn nodes' do
     context 'local variable' do
-      include_examples 'it rewrites', 'a = 1; a += 2', 'a = 1; a = a + 2'
+      include_examples 'it rewrites source-to-source', 'a = 1; a += 2', 'a = 1; a = a + 2'
     end
 
     context 'instance variable' do
-      include_examples 'it rewrites', '@a += 1', '@a = @a + 1'
+      include_examples 'it rewrites source-to-source', '@a += 1', '@a = @a + 1'
     end
 
     context 'constant' do
-      include_examples 'it rewrites', 'CONST += 1', 'CONST = CONST + 1'
+      include_examples 'it rewrites source-to-source', 'CONST += 1', 'CONST = CONST + 1'
     end
 
     context 'global variable' do
-      include_examples 'it rewrites', '$g += 1', '$g = $g + 1'
+      include_examples 'it rewrites source-to-source', '$g += 1', '$g = $g + 1'
     end
 
     context 'class variable' do
-      include_examples 'it rewrites', '@@a += 1', '@@a = @@a + 1'
+      include_examples 'it rewrites source-to-source', '@@a += 1', '@@a = @@a + 1'
     end
 
     context 'simple method call' do
-      include_examples 'it rewrites', 'recvr = 1; recvr.meth += rhs', 'recvr = 1; recvr.meth = recvr.meth + rhs'
+      include_examples 'it rewrites source-to-source', 'recvr = 1; recvr.meth += rhs', 'recvr = 1; recvr.meth = recvr.meth + rhs'
     end
 
     context '[] / []= method call' do
-      include_examples 'it rewrites', 'recvr = 1; recvr[idx] += rhs', 'recvr = 1; recvr[idx] = recvr[idx] + rhs'
+      include_examples 'it rewrites source-to-source', 'recvr = 1; recvr[idx] += rhs', 'recvr = 1; recvr[idx] = recvr[idx] + rhs'
     end
 
     context '[] / []= method call with multiple arguments' do
-      include_examples 'it rewrites',
+      include_examples 'it rewrites source-to-source',
         'recvr = 1; recvr[idx1, idx2] += rhs',
           'recvr = 1; recvr[idx1, idx2] = recvr[idx1, idx2] + rhs'
     end
@@ -73,15 +48,15 @@ RSpec.describe Opal::Rewriters::BinaryOperatorAssignment do
     context 'chain of method calls' do
       it 'rewrites += by caching receiver to a temporary local variable' do
         input = parse('recvr.a.b += rhs')
-        rewritten = rewrite(input)
+        rewritten = rewrite(input).children.first
 
         expected = s(:begin,
-          s(:lvasgn, cache_tmp_name, parse('recvr.a')), # cached = recvr.a
+          s(:lvasgn, cache_tmp_name, ast_of('recvr.a')), # cached = recvr.a
           s(:send, cached, :b=,
             s(:send,
               s(:send, cached, :b),
               :+,
-              parse('rhs'))))
+              ast_of('rhs'))))
 
         expect(rewritten).to eq(expected)
       end
@@ -90,19 +65,19 @@ RSpec.describe Opal::Rewriters::BinaryOperatorAssignment do
     context 'method call using safe nafigator' do
       it 'rewrites += by caching receiver and rewriting it to if and or_asgn' do
         input = parse('recvr&.meth += rhs')
-        rewritten = rewrite(input)
+        rewritten = rewrite(input).children.first
 
         expected = s(:begin,
-          s(:lvasgn, cache_tmp_name, parse('recvr')), # cached = recvr
-          s(:if, s(:send, cached, :nil?),             # if cached.nil?
-            s(:nil),                                  #   nil
-                                                      # else
-            s(:send, cached, :meth=,                  #   cached.meth =
+          s(:lvasgn, cache_tmp_name, ast_of('recvr')), # cached = recvr
+          s(:if, s(:send, cached, :nil?),              # if cached.nil?
+            s(:nil),                                   #   nil
+                                                       # else
+            s(:send, cached, :meth=,                   #   cached.meth =
               s(:send,
-                s(:send, cached, :meth),              #     cached.meth +
+                s(:send, cached, :meth),               #     cached.meth +
                 :+,
-                parse('rhs')))                        #     rhs
-          ))                                          # end
+                ast_of('rhs')))                        #     rhs
+          ))                                           # end
 
         expect(rewritten).to eq(expected)
       end
@@ -111,43 +86,43 @@ RSpec.describe Opal::Rewriters::BinaryOperatorAssignment do
 
   context 'rewriting defined?(or_asgn) and defined?(and_asgn)' do
     context 'local variable' do
-      include_examples 'it rewrites', 'a = nil; defined?(a += 1)', 'a = nil; "assignment"'
+      include_examples 'it rewrites source-to-source', 'a = nil; defined?(a += 1)', 'a = nil; "assignment"'
     end
 
     context 'instance variable' do
-      include_examples 'it rewrites', 'defined?(@a += 1)', %q("assignment")
+      include_examples 'it rewrites source-to-source', 'defined?(@a += 1)', %q("assignment")
     end
 
     context 'constant' do
-      include_examples 'it rewrites', 'defined?(CONST += 1)', %q("assignment")
+      include_examples 'it rewrites source-to-source', 'defined?(CONST += 1)', %q("assignment")
     end
 
     context 'global variable' do
-      include_examples 'it rewrites', 'defined?($g += 1)', %q("assignment")
+      include_examples 'it rewrites source-to-source', 'defined?($g += 1)', %q("assignment")
     end
 
     context 'class variable' do
-      include_examples 'it rewrites', 'defined?(@@a += 1)', %q("assignment")
+      include_examples 'it rewrites source-to-source', 'defined?(@@a += 1)', %q("assignment")
     end
 
     context 'simple method call' do
-      include_examples 'it rewrites', 'defined?(recvr.meth += rhs)', %q("assignment")
+      include_examples 'it rewrites source-to-source', 'defined?(recvr.meth += rhs)', %q("assignment")
     end
 
     context '[] / []= method call' do
-      include_examples 'it rewrites', 'defined?(recvr[idx] += rhs)', %q("assignment")
+      include_examples 'it rewrites source-to-source', 'defined?(recvr[idx] += rhs)', %q("assignment")
     end
 
     context '[] / []= method call with multiple arguments' do
-      include_examples 'it rewrites', 'defined?(recvr[idx1, idx2] += rhs)', %q("assignment")
+      include_examples 'it rewrites source-to-source', 'defined?(recvr[idx1, idx2] += rhs)', %q("assignment")
     end
 
     context 'chain of method calls' do
-      include_examples 'it rewrites', 'defined?(recvr.a.b.c += rhs)', %q("assignment")
+      include_examples 'it rewrites source-to-source', 'defined?(recvr.a.b.c += rhs)', %q("assignment")
     end
 
     context 'method call using safe nafigator' do
-      include_examples 'it rewrites', 'defined?(recvr&.meth += rhs)', %q("assignment")
+      include_examples 'it rewrites source-to-source', 'defined?(recvr&.meth += rhs)', %q("assignment")
     end
   end
 end

data/spec/lib/rewriters/block_to_iter_spec.rb

@@ -1,11 +1,8 @@
 require 'lib/spec_helper'
+require 'support/rewriters_helper'
 
 RSpec.describe Opal::Rewriters::BlockToIter do
-  def s(type, *children)
-    ::Opal::AST::Node.new(type, children)
-  end
-
-  let(:rewriter) { Opal::Rewriters::BlockToIter.new }
+  include RewritersHelper
 
   let(:block_node) do
     # m { |arg1| 1 }
@@ -23,6 +20,6 @@ RSpec.describe Opal::Rewriters::BlockToIter do
   end
 
   it 'rewriters s(:block) to s(:iter)' do
-    expect(rewriter.process(block_node)).to eq(iter_node)
+    expect(rewritten(block_node)).to eq(iter_node)
   end
 end

data/spec/lib/rewriters/dot_js_syntax_spec.rb

@@ -1,11 +1,8 @@
 require 'lib/spec_helper'
+require 'support/rewriters_helper'
 
 RSpec.describe Opal::Rewriters::DotJsSyntax do
-  def s(type, *children)
-    ::Opal::AST::Node.new(type, children)
-  end
-
-  let(:rewriter) { Opal::Rewriters::DotJsSyntax.new }
+  include RewritersHelper
 
   context '.JS. syntax' do
     let(:send_node) do

data/spec/lib/rewriters/for_rewriter_spec.rb

@@ -4,7 +4,6 @@ require 'opal/rewriters/for_rewriter'
 
 RSpec.describe Opal::Rewriters::ForRewriter do
   include RewritersHelper
-  extend  RewritersHelper
 
   before(:each) { Opal::Rewriters::ForRewriter.reset_tmp_counter! }
 

data/spec/lib/rewriters/forward_args_spec.rb

@@ -4,7 +4,6 @@ require 'opal/rewriters/forward_args'
 
 RSpec.describe Opal::Rewriters::ForwardArgs do
   include RewritersHelper
-  extend  RewritersHelper
 
   before(:each) { Opal::Rewriters::ForRewriter.reset_tmp_counter! }
 
@@ -23,7 +22,7 @@ RSpec.describe Opal::Rewriters::ForwardArgs do
     end
   end
 
-  include_examples 'it rewrites source-to-AST', <<~ENDSOURCE, correct_names.(parse(<<~ENDDEST))
+  include_examples 'it rewrites source-to-AST', <<~ENDSOURCE, correct_names.(ast_of(<<~ENDDEST))
     def forward(...)
       other(...)
     end
@@ -33,7 +32,7 @@ RSpec.describe Opal::Rewriters::ForwardArgs do
     end
   ENDDEST
 
-  include_examples 'it rewrites source-to-AST', <<~ENDSOURCE, correct_names.(parse(<<~ENDDEST))
+  include_examples 'it rewrites source-to-AST', <<~ENDSOURCE, correct_names.(ast_of(<<~ENDDEST))
     def forward(first_arg, ...)
       other(first_arg, second_arg, ...)
       other(other_arg, ...)

data/spec/lib/rewriters/js_reserved_words_spec.rb

@@ -1,21 +1,8 @@
 require 'lib/spec_helper'
+require 'support/rewriters_helper'
 
 RSpec.describe Opal::Rewriters::JsReservedWords do
-  def s(type, *children)
-    ::Opal::AST::Node.new(type, children)
-  end
-
-  def rewrite(sexp)
-    Opal::Rewriters::JsReservedWords.new.process(sexp)
-  end
-
-  def expect_rewritten(sexp)
-    expect(rewrite(sexp))
-  end
-
-  def expect_no_rewriting_for(sexp)
-    expect_rewritten(sexp).to eq(sexp)
-  end
+  include RewritersHelper
 
   reserved_lvars = %i(
     do if in for let new try var case else enum eval false