Run parser (sexp creation) specs in cli/ specs

adambeynon · adambeynon · commit 7aeae273f0ba · 2013-11-23T11:41:42.000Z
diff --git a/spec/cli/parser/alias_spec.rb b/spec/cli/parser/alias_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.expand_path('../../spec_helper', __FILE__)
 
 describe "The alias keyword" do
   describe "with fitem" do
diff --git a/spec/cli/parser/and_spec.rb b/spec/cli/parser/and_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.expand_path('../../spec_helper', __FILE__)
 
 describe "The and statement" do
   it "should always return s(:and)" do
diff --git a/spec/cli/parser/array_spec.rb b/spec/cli/parser/array_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.expand_path('../../spec_helper', __FILE__)
 
 describe "Arrays" do
   it "should parse empty arrays as s(:array)" do
diff --git a/spec/cli/parser/attrasgn_spec.rb b/spec/cli/parser/attrasgn_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.expand_path('../../spec_helper', __FILE__)
 
 describe "Attribute assignments" do
   it "should return a s(:attrasgn) for simple assignments" do
diff --git a/spec/cli/parser/begin_spec.rb b/spec/cli/parser/begin_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.expand_path('../../spec_helper', __FILE__)
 
 describe "The begin keyword" do
   it "should be removed when used without a resuce or enusre body" do
diff --git a/spec/cli/parser/block_spec.rb b/spec/cli/parser/block_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.expand_path('../../spec_helper', __FILE__)
 
 describe "Block statements" do
   it "should return the direct expression if only one expresssion in block" do
diff --git a/spec/cli/parser/break_spec.rb b/spec/cli/parser/break_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.expand_path('../../spec_helper', __FILE__)
 
 describe "The break keyword" do
   it "should return s(:break) when given no args" do
diff --git a/spec/cli/parser/call_spec.rb b/spec/cli/parser/call_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.expand_path('../../spec_helper', __FILE__)
 
 describe "Method calls" do
   it "should use 'nil' for calls without a receiver" do
diff --git a/spec/cli/parser/class_spec.rb b/spec/cli/parser/class_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.expand_path('../../spec_helper', __FILE__)
 
 describe "The class keyword" do
   it "returns an empty s(:block) when given an empty body" do
diff --git a/spec/cli/parser/const_spec.rb b/spec/cli/parser/const_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.expand_path('../../spec_helper', __FILE__)
 
 describe "Constants" do
   it "should always become a s(:const)" do
diff --git a/spec/cli/parser/cvar_spec.rb b/spec/cli/parser/cvar_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.expand_path('../../spec_helper', __FILE__)
 
 describe "Class variables" do
   it "should always be returned as s(:cvar)" do
diff --git a/spec/cli/parser/def_spec.rb b/spec/cli/parser/def_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.expand_path('../../spec_helper', __FILE__)
 
 describe "The def keyword" do
   describe "for normal definitions" do
diff --git a/spec/cli/parser/false_spec.rb b/spec/cli/parser/false_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.expand_path('../../spec_helper', __FILE__)
 
 describe "The false keyword" do
   it "should always return s(:false)" do
diff --git a/spec/cli/parser/file_spec.rb b/spec/cli/parser/file_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.expand_path('../../spec_helper', __FILE__)
 
 describe "The __FILE__ keyword" do
   it "should always return a s(:str) with given parser filename" do
diff --git a/spec/cli/parser/gvar_spec.rb b/spec/cli/parser/gvar_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.expand_path('../../spec_helper', __FILE__)
 
 describe "Global variables" do
   it "should be returned as s(:gvar)" do
diff --git a/spec/cli/parser/hash_spec.rb b/spec/cli/parser/hash_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.expand_path('../../spec_helper', __FILE__)
 
 describe "Hash literals" do
   it "without any assocs should return an empty hash sexp" do
diff --git a/spec/cli/parser/heredoc_spec.rb b/spec/cli/parser/heredoc_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.expand_path('../../spec_helper', __FILE__)
 
 describe "Heredocs" do
 
diff --git a/spec/cli/parser/iasgn_spec.rb b/spec/cli/parser/iasgn_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.expand_path('../../spec_helper', __FILE__)
 
 describe "Instance variable assignment" do
   it "always returns an s(:iasgn)" do
diff --git a/spec/cli/parser/if_spec.rb b/spec/cli/parser/if_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.expand_path('../../spec_helper', __FILE__)
 
 describe "The if keyword" do
   it "should return an s(:if) with given truthy and falsy bodies" do
diff --git a/spec/cli/parser/int_spec.rb b/spec/cli/parser/int_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.expand_path('../../spec_helper', __FILE__)
 
 describe "Parsing integers" do
   it "parses integers as a s(:int) sexp" do
diff --git a/spec/cli/parser/iter_spec.rb b/spec/cli/parser/iter_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.expand_path('../../spec_helper', __FILE__)
 
 describe "Iters" do
   describe "Iter on a command" do
diff --git a/spec/cli/parser/ivar_spec.rb b/spec/cli/parser/ivar_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.expand_path('../../spec_helper', __FILE__)
 
 describe "Instance variables" do
   it "always return an s(:ivar)" do
diff --git a/spec/cli/parser/lambda_spec.rb b/spec/cli/parser/lambda_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.expand_path('../../spec_helper', __FILE__)
 
 describe "Lambda literals" do
   it "should parse with either do/end construct or curly braces" do
diff --git a/spec/cli/parser/lasgn_spec.rb b/spec/cli/parser/lasgn_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.expand_path('../../spec_helper', __FILE__)
 
 describe "Local assignment" do
   it "returns an s(:lasgn)" do
diff --git a/spec/cli/parser/line_spec.rb b/spec/cli/parser/line_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.expand_path('../../spec_helper', __FILE__)
 
 describe "The __LINE__ keyword" do
   it "should always return a literal number of the current line" do
diff --git a/spec/cli/parser/lvar_spec.rb b/spec/cli/parser/lvar_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.expand_path('../../spec_helper', __FILE__)
 
 describe "An lvar" do
   describe "in any scope" do
diff --git a/spec/cli/parser/masgn_spec.rb b/spec/cli/parser/masgn_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.expand_path('../../spec_helper', __FILE__)
 
 describe "Masgn" do
   describe "with a single lhs splat" do
diff --git a/spec/cli/parser/module_spec.rb b/spec/cli/parser/module_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.expand_path('../../spec_helper', __FILE__)
 
 describe "The module keyword" do
   it "returns an empty s(:block) when given an empty body" do
diff --git a/spec/cli/parser/nil_spec.rb b/spec/cli/parser/nil_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.expand_path('../../spec_helper', __FILE__)
 
 describe "The nil keyword" do
   it "always returns s(:nil)" do
diff --git a/spec/cli/parser/not_spec.rb b/spec/cli/parser/not_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.expand_path('../../spec_helper', __FILE__)
 
 describe "The not keyword" do
   it "returns s(:not) with the single argument" do
diff --git a/spec/cli/parser/nth_ref_spec.rb b/spec/cli/parser/nth_ref_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.expand_path('../../spec_helper', __FILE__)
 
 describe "$1..$9" do
   it "parses as s(:nth_ref)" do
diff --git a/spec/cli/parser/op_asgn1_spec.rb b/spec/cli/parser/op_asgn1_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.expand_path('../../spec_helper', __FILE__)
 
 describe "op_asgn1" do
   it "returns s(:op_asgn1)" do
@@ -14,7 +14,7 @@
   end
 
   it "only uses the operator, not with '=' appended" do
-    opal_parse("self[:foo] += 1")[3].should == :+
+    opal_parse("self[:foo] += 1")[3].should == '+'
   end
 
   it "uses a simple sexp, not an arglist" do
diff --git a/spec/cli/parser/op_asgn2_spec.rb b/spec/cli/parser/op_asgn2_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.expand_path('../../spec_helper', __FILE__)
 
 describe "op_asgn2" do
   it "returns s(:op_asgn2)" do
diff --git a/spec/cli/parser/or_spec.rb b/spec/cli/parser/or_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.expand_path('../../spec_helper', __FILE__)
 
 describe "The or statement" do
   it "should always return s(:or)" do
diff --git a/spec/cli/parser/parse_spec.rb b/spec/cli/parser/parse_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.expand_path('../../spec_helper', __FILE__)
 
 describe Opal::Compiler do
   it "parses operators before \n in command calls" do
diff --git a/spec/cli/parser/regexp_spec.rb b/spec/cli/parser/regexp_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.expand_path('../../spec_helper', __FILE__)
 
 describe "Regexps" do
   it "parses a regexp as a s(:lit)" do
diff --git a/spec/cli/parser/return_spec.rb b/spec/cli/parser/return_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.expand_path('../../spec_helper', __FILE__)
 
 describe "The return keyword" do
   it "should return s(:return) when given no arguments" do
diff --git a/spec/cli/parser/sclass_spec.rb b/spec/cli/parser/sclass_spec.rb
@@ -1,8 +1,8 @@
-require 'spec_helper'
+require File.expand_path('../../spec_helper', __FILE__)
 
 describe "Singleton classes" do
-  it "returns an empty s(:scope) when given an empty body" do
-    opal_parse('class << A; end')[2].should == [:scope]
+  it "returns an empty s(:block) when given an empty body" do
+    opal_parse('class << A; end')[2].should == [:block]
   end
 
   it "does not place single expressions into an s(:block)" do
@@ -14,8 +14,8 @@
   end
 
   it "should accept any expressions for singleton part" do
-    opal_parse('class << A; end').should == [:sclass, [:const, :A], [:scope]]
-    opal_parse('class << self; end').should == [:sclass, [:self], [:scope]]
+    opal_parse('class << A; end').should == [:sclass, [:const, :A], [:block]]
+    opal_parse('class << self; end').should == [:sclass, [:self], [:block]]
   end
 end
 
diff --git a/spec/cli/parser/self_spec.rb b/spec/cli/parser/self_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.expand_path('../../spec_helper', __FILE__)
 
 describe "The self keyword" do
   it "always returns s(:self)" do
diff --git a/spec/cli/parser/str_spec.rb b/spec/cli/parser/str_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.expand_path('../../spec_helper', __FILE__)
 
 describe "Strings" do
   it "parses empty strings" do
diff --git a/spec/cli/parser/string_spec.rb b/spec/cli/parser/string_spec.rb
@@ -1,4 +1,4 @@
-require "spec_helper"
+require File.expand_path('../../spec_helper', __FILE__)
 
 describe "Strings" do
   it "parses %[] strings" do
diff --git a/spec/cli/parser/super_spec.rb b/spec/cli/parser/super_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.expand_path('../../spec_helper', __FILE__)
 
 describe "The super keyword" do
   it "should return s(:super) for any arguments" do
diff --git a/spec/cli/parser/true_spec.rb b/spec/cli/parser/true_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.expand_path('../../spec_helper', __FILE__)
 
 describe "The true keyword" do
   it "always returns s(:true)" do
diff --git a/spec/cli/parser/undef_spec.rb b/spec/cli/parser/undef_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.expand_path('../../spec_helper', __FILE__)
 
 describe "The undef keyword" do
   it "returns s(:undef) with the argument as an s(:lit)" do
diff --git a/spec/cli/parser/unless_spec.rb b/spec/cli/parser/unless_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.expand_path('../../spec_helper', __FILE__)
 
 describe "The unless keyword" do
   it "returns s(:if) with reversed true and false bodies" do
diff --git a/spec/cli/parser/while_spec.rb b/spec/cli/parser/while_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.expand_path('../../spec_helper', __FILE__)
 
 describe "The while keyword" do
   it "returns an s(:while) with the given expr, body and true for head" do
diff --git a/spec/cli/parser/xstr_spec.rb b/spec/cli/parser/xstr_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.expand_path('../../spec_helper', __FILE__)
 
 describe "x-strings" do
   it "parses simple xstring as s(:xstr)" do
diff --git a/spec/cli/parser/yield_spec.rb b/spec/cli/parser/yield_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.expand_path('../../spec_helper', __FILE__)
 
 describe "The yield keyword" do
   it "should return s(:yield) when no arguments given" do
diff --git a/spec/cli/spec_helper.rb b/spec/cli/spec_helper.rb
@@ -1,17 +1,16 @@
-# This file was generated by the `rspec --init` command. Conventionally, all
-# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
-# Require this file using `require "spec_helper"` to ensure that it is only
-# loaded once.
-#
-# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+require 'opal'
+
+module OpalSpecHelpers
+  def opal_parse(str, file='(string)')
+    Opal::Parser.new.parse str, file
+  end
+end
+
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
-
-  # Run specs in random order to surface order dependencies. If you find an
-  # order dependency and want to debug it, you can fix the order by providing
-  # the seed, which is printed after each run.
-  #     --seed 1234
   config.order = 'random'
+
+  config.include OpalSpecHelpers
 end

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-require 'spec_helper'`
	`1`	`+require File.expand_path('../../spec_helper', __FILE__)`
`2`	`2`
`3`	`3`	`describe "The alias keyword" do`
`4`	`4`	`describe "with fitem" do`