opal-rspec 0.5.0.beta3 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e305c2f7bb59109967cbb5289965f1768476df0b
-  data.tar.gz: b60ba2e8cf4f778bd45da0051a7484275e216564
+  metadata.gz: 1da9042a8eae6f23afb1f989cd88ac73bb16bf2b
+  data.tar.gz: 199ade21ce80c64e09f5123ecadd37d156c7cde9
 SHA512:
-  metadata.gz: ddb89491fed04a63256e2cea28df2cd56a020adbd63b09325ff76f26166744695bebc0a30724a0f3570d07d5d0d96181ad2991276f9ea5ad92532f4c64504b49
-  data.tar.gz: 9f78bfdf6d812667149f8b978a2694c66227b1f42bdf01f1036424f476bc89fb78bdab62cc0dfc5b47d69766b75cccf7c66a74c8bac4ab78675eb5271beec3d9
+  metadata.gz: 07fd2261509f2ac82c45866d6acbce58db865a75e08fb04ae48ab8047589781b70b940f1f00b419b07ae35118a692ddb0af27e3ea9a5089a01cb06dc514359a9
+  data.tar.gz: fa16038e70c8daa6cd27ac081a295fdba6c9bb3f96e353e72446173cce572eca39945d3a0782cd23c04f852807fd2b435f8f6d33b09fdf3ba9334308b03d0283

data/.travis.yml

@@ -8,14 +8,29 @@ matrix:
   fast_finish: true
 
   include:
-    - rvm: 1.9.3
-      env: RUN=default
+    # - rvm: 1.9.3
+    #   env: RUN=default
     - rvm: 2.0.0
       env: RUN=default
     - rvm: 2.1.0
       env: RUN=default
     - rvm: 2.2.3
       env: RUN=default
+    - rvm: 2.2.3
+      # PHANTOMJS env variable is not used but it makes it easier to differentiate this build in Travis
+      # https://github.com/travis-ci/travis-ci/issues/3225 - Easiest way to use 2.0 on Travis
+      env: RUN=default PHANTOMJS=2.0
+      before_script:
+        - "mkdir phantom20"
+        - "export PATH=`pwd`/phantom20:$PATH"
+        - "echo $PATH"
+        - "pushd ."
+        - "cd phantom20"
+        - "curl -L -O https://s3.amazonaws.com/travis-phantomjs/phantomjs-2.0.0-ubuntu-12.04.tar.bz2"
+        - "tar xjvf phantomjs-2.0.0-ubuntu-12.04.tar.bz2"
+        - "popd"
+        - "export DISPLAY=:99.0"
+        - "sh -e /etc/init.d/xvfb start"
     - rvm: 2.2.3
       env: RUN=default RUNNER=node
     - rvm: 2.2.3

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-## 0.5.0 (edge)
+## 0.5.0 (2015-12-08)
 
 *   By default, any subject, it example block, before(:each), after(:each), and around that returns a promise will be executed asynchronously. Async is NOT yet supported for context level hooks. Async approach from < 0.4.3 will still work.
 
@@ -17,7 +17,7 @@
 *   Formatters:
   * Fixed issues with RSpec's BaseTextFormatter and made ProgressFormatter the default when run via the Rake task
   * Fix redundant messages with expectation fails
-  * Browser formatter now works w/ progress bar
+  * Browser formatter now works w/ progress bar and has a 'Dump to console' link that will put a clickable stack trace for a failed example in the browser console
   * JSON formatter supported
 
 *   Fixed issues with constants/example group naming
@@ -26,6 +26,8 @@
 
 *   A lot more matchers enabled
 
+*  PhantomJS 2.0 compatibility (also still compatible with 1.9.8). Thanks to @aost. Closes out https://github.com/opal/opal-rspec/issues/42
+
 
 ## 0.4.3 (2015-06-14)
 

data/README.md

@@ -14,6 +14,12 @@ Add `opal-rspec` to your Gemfile:
 gem 'opal-rspec'
 ```
 
+## Requirements
+
+Besides what's already reflected in the GEM dependencies:
+* PhantomJS 1.9.8 or 2.0 for Rake task testing
+* Browser if you want to run and debug tests that way
+
 ### Run specs in phantomjs
 
 To run specs, a rake task can be added which will load all spec files from
@@ -59,10 +65,13 @@ You can also customize the pattern of specs used similiar to how RSpec's rake ta
 Opal::RSpec::RakeTask.new(:default) do |server, task|
   # server is an instance of Opal::Server in case you want to add to the load path, customize, etc.
   task.pattern = 'spec_alternate/**/*_spec.rb' # can also supply an array of patterns
+  # NOTE: opal-rspec, like rspec, only adds 'spec' to the Opal load path unless you set default_path
+  task.default_path = 'spec_alternate'
 end
 ```
 
 Excluding patterns can be setup this way:
+
 ```ruby
 Opal::RSpec::RakeTask.new(:default) do |server, task|
   task.exclude_pattern = 'spec_alternate/**/*_spec.rb' # can also supply an array of patterns
@@ -73,7 +82,7 @@ FileLists (as in Rake FileLists) can also be supplied:
 
 ```ruby
 Opal::RSpec::RakeTask.new(:default) do |server, task|
-  task.files = FileList['spec/**/something_spec.rb]
+  task.files = FileList['spec/**/something_spec.rb']
 end
 ```
 
@@ -81,14 +90,14 @@ PhantomJS will timeout by default after 60 seconds. If you need to lengthen the
 
 ```ruby
 Opal::RSpec::RakeTask.new(:default) do |server, task|
-  task.files = FileList['spec/**/something_spec.rb]
+  task.files = FileList['spec/**/something_spec.rb']
   task.timeout = 80000 # 80 seconds, unit needs to be milliseconds
 end
 ```
 
 ### Run specs in nodejs
 
-Same options as above, you can use the RUNNER=node environment variable or use the Rake task like so:
+Same options as above, you can use the `RUNNER=node` environment variable or use the Rake task like so:
 
 ```ruby
 Opal::RSpec::RakeTask.new(:default) do |server, task|
@@ -117,6 +126,10 @@ run Opal::Server.new(sprockets: sprockets_env) { |s|
 Then run the rack server `bundle exec rackup` and visit `http://localhost:9292`
 in any web browser.
 
+A new feature of opal-rspec 0.5 allows you to click a 'Console' button in the browser's test results and get a 
+clickable stack trace in the browser console. This should ease debugging with long, concatenated script files and trying
+to navigate to where an exception occurred.
+
 ## Async examples
 
 `opal-rspec` adds support for async specs to rspec. These specs can be defined using 2 approaches:
@@ -180,9 +193,11 @@ end
 ```
 
 Advantages:
+
 * Assuming your subject under test (or matchers) return/use promises, the syntax is the same for sync or async specs
 
 Limitations (apply to both async approaches):
+
 * Right now, async `before(:context)` and `after(:context)` hooks cannot be async
 * You cannot use an around hooks on any example where before(:each)/after(:each) hooks are async or with an async implicit subject
 * `let` dependencies cannot be async, only subject
@@ -209,43 +224,40 @@ so it can move on. Any failures/expectations run inside this block will be run
 in the context of the example.
 
 Advantages:
+
 * Hides promises from the specs
 
 Disadvantages:
+
 * Requires different syntax for async specs vs. sync specs
 
 ## Opal load path
 
-NOTE: Only the deepest directory specified will be added to the Opal load path.
-
-Example 1: For the example patterns above, only 'spec_alternate' will be added.
+NOTE: Only the 'spec' directory will be added to the Opal load path by default. Use the Rake task's 'default_path' setting to change that
 
-Example 2: Single base path
+## Other Limitations/Known Issues
 
-For a pattern of:
+* Core Examples
+  * Example groups included like this are currently not working:
 ```ruby
-'spec/other/**/*spec.rb'
-```
-
-'spec/other' will be added to the load path.
-
-Example 3: Different base paths
-
-Multiple patterns are specified that share the same parent:
+module TestMod
+  def self.included(base)
+    base.class_eval do
+      describe 'foo' do
+      ...
+      end
+    end
+  end
+end
 
-For a pattern of:
-```ruby
-['spec/opal/**/*hooks_spec.rb', 'spec/other/**/*_spec.rb']
+RSpec.configure do |c|
+  c.include TestMod
+end
 ```
-
-Only 'spec' will be added to the load path.
-
-## Other Limitations/Known Issues
-
 * Formatting
   * Backtrace info on specs is buggy ([no Kernel::caller method in Opal](https://github.com/opal/opal/issues/894)), in Firefox w/ the browser runner, no backtraces show up with failed specs
   * Diffs are not yet available when objects do not meet expectations (diff-lcs gem dependency has not been dealt with yet in Opal)
-* Configuration  
+* Configuration
   * Not all RSpec runner options are supported yet
   * At some point, using node + Phantom's ability to read environment variables could be combined with a opal friendly optparse implementation to allow full options to be supplied/parsed
   * Expect and should syntax are both enabled. They cannot be disabled due to bugs with the `undef` keyword in Opal 0.8. Status of changing this via config has not been tested in Opal 0.9.
@@ -263,7 +275,7 @@ Only 'spec' will be added to the load path.
   * arity checking is not enabled by default in Opal but it can be. It's not currently enabled because it broke a lot of Opal specs. As a result, any matcher use (particularly respond_to) that depends on arity checking will not work
   * splat methods and expect(...).to respond_to will be inconsistent in Opal 0.8 since several splat bugs were fixed with Opal 0.9
 * Mocks
-  * `allow_any_instance/any_instance_of/any_instance` will not work and may cause runner to crash due to issues with redefining the `===` operator, which breaks a case statement inside `Hooks#find_hook`
+  * `allow_any_instance/any_instance_of/any_instance` are unstable and may cause runner to crash due to issues with redefining the `===` operator, which breaks a case statement inside `Hooks#find_hook`
   * using expect/allow on `String`, `Number`, or any immutable bridged/native class, does not work since rspec-mocks uses singleton classes and those cannot be defined on immutable objects
   * mocking class methods (including `::new`) is currently broken
   * `class_double/class_spy` are not supported (it depends on `ClassVerifyingDouble` inheriting from `Module` to support transferring nested constants, but that doesn't work on Opal)

data/Rakefile

@@ -9,11 +9,22 @@ require_relative 'spec/rspec/expectations/expectation_spec_loader'
 require_relative 'spec/rspec/support/support_spec_loader'
 require_relative 'spec/rspec/mocks/mocks_spec_loader'
 
-task :default => [:unit_specs, :verify_opal_specs, :integration_specs, :verify_rspec_specs]
+task :default => [:phantom_node_ver,
+                  :unit_specs,
+                  :verify_opal_specs,
+                  :integration_specs,
+                  :verify_rspec_specs]
+
+task :phantom_node_ver do
+  sh 'phantomjs -v'
+  sh 'node -v'
+  sh 'firefox --version'
+end
 
 desc 'Runs a set of specs in opal'
 Opal::RSpec::RakeTask.new(:opal_specs) do |_, task|
   task.pattern = 'spec/opal/**/*_spec.{rb,opal}'
+  task.default_path = 'spec/opal'
 end
 
 desc 'Generates an RSpec requires file free of dynamic requires'
@@ -36,10 +47,12 @@ end
 desc 'A more limited spec suite to test pattern usage'
 Opal::RSpec::RakeTask.new(:other_specs) do |_, task|
   task.pattern = 'spec/other/dummy_spec.rb'
+  task.default_path = 'spec/other'
 end
 
 Opal::RSpec::RakeTask.new(:color_on_by_default) do |_, task|
   task.pattern = 'spec/other/color_on_by_default_spec.rb'
+  task.default_path = 'spec/other'
 end
 
 Opal::RSpec::CoreSpecLoader.rake_tasks_for(:rspec_core_specs)

data/config.ru

@@ -2,11 +2,14 @@ require 'opal/rspec'
 
 Opal::Processor.source_map_enabled = false
 
-sprockets_env = Opal::RSpec::SprocketsEnvironment.new(spec_pattern='spec/opal/**/*_spec.{rb,opal}')
+sprockets_env = Opal::RSpec::SprocketsEnvironment.new(spec_pattern='spec/opal/**/*_spec.{rb,opal}',
+                                                      spec_exclude_pattern=nil,
+                                                      spec_files=nil,
+                                                      default_path='spec/opal')
 run Opal::Server.new(sprockets: sprockets_env) { |s|
-  s.main = 'sprockets_runner_js_errors'
-  # sprockets_runner_js_errors will not be in the opal load path by default
-  s.append_path 'spec/mri/integration/rack'
-  sprockets_env.add_spec_paths_to_sprockets
-  s.debug = ENV['OPAL_DEBUG']
-}
+      s.main = 'sprockets_runner_js_errors'
+      # sprockets_runner_js_errors will not be in the opal load path by default
+      s.append_path 'spec/mri/integration/rack'
+      sprockets_env.add_spec_paths_to_sprockets
+      s.debug = ENV['OPAL_DEBUG']
+    }

data/lib/opal/rspec/cached_environment.rb

@@ -13,7 +13,9 @@ module Opal
 
       def get_opal_spec_requires
         @locator.get_opal_spec_requires.map do |file|
-          logical_path = find_asset(file).logical_path
+          asset = find_asset(file)
+          raise "Unable to find asset for file #{file} within load paths #{paths}. Check your load path/file specification." unless asset
+          logical_path = asset.logical_path
           # These will go directly into require '...' statements in Opal, so need to trim extensions
           logical_path.sub File.extname(logical_path), ''
         end

data/lib/opal/rspec/post_rack_locator.rb

@@ -11,7 +11,7 @@ module Opal
 
       def get_opal_spec_requires
         files = @spec_files || FileList[*@spec_pattern].exclude(*@spec_exclude_pattern)
-        files.map do |file|
+        files.uniq.map do |file|
           File.expand_path file
         end
       end

data/lib/opal/rspec/pre_rack_locator.rb

@@ -1,67 +1,31 @@
 require 'pathname'
+# require the bundled RSpec's file and don't rely on the load path in case opal-rspec is included in a project's
+# Gemfile without rspec also being in the Gemfile
+require_relative '../../../rspec-core/lib/rspec/core/ruby_project'
 
 module Opal
   module RSpec
     class PreRackLocator
+      include ::RSpec::Core::RubyProject
+
       DEFAULT_PATTERN = 'spec/**/*_spec.{rb,opal}'
+      DEFAULT_DEFAULT_PATH = 'spec'
 
-      attr_accessor :spec_pattern, :spec_exclude_pattern, :spec_files
+      attr_accessor :spec_pattern, :spec_exclude_pattern, :spec_files, :default_path
 
-      def initialize(spec_pattern=nil, spec_exclude_pattern=nil, spec_files=nil)
+      def initialize(spec_pattern=nil, spec_exclude_pattern=nil, spec_files=nil, default_path=nil)
         @spec_pattern = spec_pattern || DEFAULT_PATTERN
         @spec_exclude_pattern = spec_exclude_pattern
         @spec_files = spec_files
+        @default_path = default_path || DEFAULT_DEFAULT_PATH
       end
 
-      def get_spec_load_paths
-        base_paths = spec_files ? get_files_directories : strip_globs_from_patterns
-        # Want to get the smallest # of load paths that's common between our patterns
-        array_or_single = base_paths.inject do |path1, path2|
-          with_common_paths_replaced path1, path2
-        end
-        [*array_or_single]
-      end
-
-      private
-
-      def strip_globs_from_patterns
-        # only using spec_pattern here since we only need paths for inclusion
-        [*spec_pattern].map do |each_pattern|
-          glob_portion = /[\*\?\[\{].*/.match each_pattern
-          path = glob_portion ? each_pattern.sub(glob_portion.to_s, '') : each_pattern
-          raise "Unable to identify a single root directory/file in the pattern #{each_pattern}. Please adjust glob" unless File.exist?(path)
-          path = Pathname.new path
-          # in case a filename was used as a pattern
-          path.directory? ? path : path.dirname
-        end
-      end
-
-      def get_files_directories
-        spec_files.map do |file|
-          Pathname.new(file).dirname
-        end.uniq
+      def determine_root
+        find_first_parent_containing(@default_path) || '.'
       end
 
-      def with_common_paths_replaced(existing_paths, new_path)
-        new_path_covered = false
-        replaced = [*existing_paths].map do |path|
-          match = nil
-          path.ascend do |each_level|
-            new_path.ascend do |each_other_level|
-              match = each_level if each_level.expand_path == each_other_level.expand_path
-              break if match
-            end
-            break if match
-          end
-          if match
-            new_path_covered = true
-            match
-          else
-            path
-          end
-        end
-        replaced << new_path unless new_path_covered
-        replaced.uniq
+      def get_spec_load_paths
+        [@default_path].map { |dir| File.join(root, dir) }
       end
     end
   end

data/lib/opal/rspec/rake_task.rb

@@ -11,7 +11,7 @@ module Opal
       PORT = 9999
       URL = "http://localhost:#{PORT}/"
 
-      attr_accessor :pattern, :exclude_pattern, :files, :runner, :timeout
+      attr_accessor :pattern, :exclude_pattern, :files, :default_path, :runner, :timeout
 
       def launch_phantom(timeout_value)
         command_line = %Q{phantomjs #{RUNNER} "#{URL}"#{timeout_value ? " #{timeout_value}" : ''}}
@@ -93,6 +93,7 @@ module Opal
             sprockets_env.spec_pattern = self.pattern if self.pattern
             sprockets_env.spec_exclude_pattern = self.exclude_pattern
             sprockets_env.spec_files = self.files
+            sprockets_env.default_path = self.default_path if self.default_path
             raise 'Cannot supply both a pattern and files!' if self.files and self.pattern
             sprockets_env.add_spec_paths_to_sprockets
           }
@@ -112,14 +113,8 @@ module Opal
           wait_for_server
           is_phantom = runner == :phantom
           if is_phantom
-            if `phantomjs -v`.strip.to_i >= 2
-              warn <<-WARN.gsub(/^              /, '')
-                Only PhantomJS v1 is currently supported,
-                if you're using homebrew on OSX you can switch version with:
-
-                  brew switch phantomjs 1.9.8
-
-              WARN
+            if `phantomjs -v`.nil?
+              warn "Could not find phantomjs command"
               exit 1
             end
           end

data/lib/opal/rspec/sprockets_environment.rb

@@ -16,10 +16,12 @@ module Opal
                      :spec_exclude_pattern=,
                      :spec_exclude_pattern,
                      :spec_files=,
-                     :spec_files
+                     :spec_files,
+                     :default_path=,
+                     :default_path
 
-      def initialize(spec_pattern=nil, spec_exclude_pattern=nil, spec_files=nil)
-        @locator = RSpec::PreRackLocator.new spec_pattern, spec_exclude_pattern, spec_files
+      def initialize(spec_pattern=nil, spec_exclude_pattern=nil, spec_files=nil, default_path=nil)
+        @locator = RSpec::PreRackLocator.new spec_pattern, spec_exclude_pattern, spec_files, default_path
         super()
       end
 

data/lib/opal/rspec/version.rb

@@ -1,5 +1,5 @@
 module Opal
   module RSpec
-    VERSION = '0.5.0.beta3'
+    VERSION = '0.5.0'
   end
 end

data/opal/opal/rspec/formatter/element.rb

@@ -31,8 +31,16 @@ module Opal
         `#@native.className`
       end
 
-      def get_child_by_tag_name(tag)
-        Element.new(`#@native.getElementsByTagName(#{tag})[0]`)
+      def get_child_by_tag_name(tag, index=0)
+        elements = `#@native.getElementsByTagName(#{tag})`
+        # is an HTMLCollection, not an array
+        element_array = []
+        %x{
+          for (var i=0; i < #{elements}.length; i++) {
+            #{element_array}.push(#{elements}[i]);
+          }
+        }
+        Element.new(element_array[index])
       end
 
       def class_name=(name)
@@ -47,6 +55,10 @@ module Opal
         `#@native.outerHTML`
       end
 
+      def on_click=(lambda)
+        `#@native.onclick = #{lambda}`
+      end
+
       def html=(html)
         `#@native.innerHTML = #{html}`
       end

data/opal/opal/rspec/formatter/html_printer.rb

@@ -24,8 +24,12 @@ module Opal
         @root_node = Element.klass 'results'
       end
 
+      def current_node
+        @group_stack.last ? @group_stack.last : @root_node
+      end
+
       def flush_output
-        node = @group_stack.last ? @group_stack.last : @root_node
+        node = current_node
         new_node = Element.from_string(@output.string)
         node.append new_node
         reset_output
@@ -38,7 +42,7 @@ module Opal
       def print_example_group_start(group_id, description, number_of_parents)
         super
         @output.puts '</dl></div>'
-        parent_node = @group_stack.last ? @group_stack.last : @root_node
+        parent_node = current_node
         new_node = Element.from_string(@output.string)
         reset_output
         parent_node << new_node
@@ -60,6 +64,14 @@ module Opal
       def print_example_failed(pending_fixed, description, run_time, failure_id, exception, extra_content, escape_backtrace=false)
         super
         flush_output
+        example_we_just_wrote = current_node.get_child_by_tag_name('dd', index=-1)
+        dump_message = lambda do
+          puts "Exception for example '#{description}'\n#{exception[:backtrace]}"
+          false
+        end
+        button = Element.from_string('<form><button type="button">Console</button></form>')
+        button.on_click = dump_message
+        example_we_just_wrote << button
       end
 
       def print_example_pending(description, pending_message)

data/spec/mri/unit/opal/rspec/cached_environment_spec.rb

@@ -6,10 +6,11 @@ require_relative 'temp_dir_helper'
 describe Opal::RSpec::CachedEnvironment do
   let(:pattern) { nil }
   let(:exclude_pattern) { nil }
+  let(:default_path) { nil }
   let(:files) { nil }
   include_context :temp_dir
 
-  let(:original_env) { Opal::RSpec::SprocketsEnvironment.new pattern, exclude_pattern, files }
+  let(:original_env) { Opal::RSpec::SprocketsEnvironment.new pattern, exclude_pattern, files, default_path }
 
   subject(:env) do
     # in subject to allow contexts to execute before logic
@@ -20,54 +21,35 @@ describe Opal::RSpec::CachedEnvironment do
   describe '#get_opal_spec_requires' do
     subject { env.get_opal_spec_requires.sort }
 
-    context '1 path' do
+    context 'no default path set' do
       before do
         create_dummy_spec_files 'spec/foobar/dummy_spec.rb', 'spec/foobar/ignored_spec.opal'
       end
 
       let(:pattern) { 'spec/foobar/**/*_spec.rb' }
 
-      it { is_expected.to eq ['dummy_spec'] }
+      it { is_expected.to eq ['foobar/dummy_spec'] }
     end
 
-    context '2 paths, same root' do
+    context 'default path set' do
       before do
-        create_dummy_spec_files 'spec/foobar/dummy_spec.rb', 'spec/noway/other_spec.rb'
-      end
-
-      let(:pattern) { ['spec/foobar/**/*y_spec.rb', 'spec/noway/**/*_spec.rb'] }
-
-      it { is_expected.to eq ['foobar/dummy_spec', 'noway/other_spec'] }
-    end
-
-    context '2 paths, different root' do
-      before do
-        create_dummy_spec_files 'spec/foobar/dummy_spec.rb', 'other_path/other_spec.rb'
-      end
-
-      let(:pattern) { ['spec/foobar/**/*_spec.rb', 'other_path/**/*.rb'] }
-
-      it { is_expected.to eq ['dummy_spec', 'other_spec'] }
-    end
-
-    context 'specs in different paths, same name in middle dirs' do
-      before do
-        create_dummy_spec_files 'foobar/spec/something/dummy_spec.rb', 'spec/foobar/other_spec.rb'
+        create_dummy_spec_files 'spec/foobar/dummy_spec.rb', 'spec/foobar/ignored_spec.opal'
       end
 
-      let(:pattern) { ['foobar/spec/**/*_spec.rb', 'spec/foobar/other_spec.rb'] }
+      let(:pattern) { 'spec/foobar/**/*_spec.rb' }
+      let(:default_path) { 'spec/foobar' }
 
-      it { is_expected.to eq ['other_spec', 'something/dummy_spec'] }
+      it { is_expected.to eq ['dummy_spec'] }
     end
 
-    context 'absolute path and relative path that are not in the same tree' do
+    context 'multiple pattern' do
       before do
-        create_dummy_spec_files 'spec/foobar/dummy_spec.rb', 'stuff/bar/other_spec.rb'
+        create_dummy_spec_files 'spec/foobar/hello1_spec.rb', 'spec/foobar/hello2_spec.rb', 'spec/foobar/bye1_spec.rb', 'spec/foobar/bye2_spec.rb'
       end
 
-      let(:files) { FileList['spec/foobar/**/*_spec.rb', 'stuff/bar/other_spec.rb'] }
+      let(:pattern) { %w(**/*/*1_spec.rb **/*/bye*_spec.rb) }
 
-      it { is_expected.to eq ['dummy_spec', 'other_spec'] }
+      it { is_expected.to eq %w(foobar/bye1_spec foobar/bye2_spec foobar/hello1_spec) }
     end
 
     context 'exclude pattern' do
@@ -80,11 +62,11 @@ describe Opal::RSpec::CachedEnvironment do
       context 'single' do
         let(:exclude_pattern) { '**/*/*1_spec.rb' }
 
-        it { is_expected.to eq ['foobar/bye2_spec', 'foobar/hello2_spec'] }
+        it { is_expected.to eq %w(foobar/bye2_spec foobar/hello2_spec) }
       end
 
       context 'multiple' do
-        let(:exclude_pattern) { ['**/*/*1_spec.rb', '**/*/bye*_spec.rb' ] }
+        let(:exclude_pattern) { %w(**/*/*1_spec.rb **/*/bye*_spec.rb) }
 
         it { is_expected.to eq ['foobar/hello2_spec'] }
       end
@@ -97,7 +79,7 @@ describe Opal::RSpec::CachedEnvironment do
 
       let(:files) { FileList['spec/**/h*_spec.rb'] }
 
-      it { is_expected.to eq ['hello1_spec', 'hello2_spec'] }
+      it { is_expected.to eq %w(foobar/hello1_spec foobar/hello2_spec) }
     end
   end
 end

data/spec/mri/unit/opal/rspec/rake_task_spec.rb

@@ -164,9 +164,26 @@ describe Opal::RSpec::RakeTask do
   end
 
   context 'pattern' do
+    let(:task_definition) do
+      Opal::RSpec::RakeTask.new(task_name) do |_, task|
+        task.pattern = 'spec/other/**/*_spec.rb'
+      end
+    end
+
+    before do
+      create_dummy_spec_files 'spec/other/dummy_spec.rb'
+    end
+
+    it { is_expected.to have_attributes pattern: 'spec/other/**/*_spec.rb' }
+    it { is_expected.to append_opal_path 'spec' }
+    it { is_expected.to require_opal_specs eq ['other/dummy_spec'] }
+  end
+
+  context 'default path' do
     let(:task_definition) do
       Opal::RSpec::RakeTask.new(task_name) do |server, task|
         task.pattern = 'spec/other/**/*_spec.rb'
+        task.default_path = 'spec/other'
       end
     end
 
@@ -182,7 +199,7 @@ describe Opal::RSpec::RakeTask do
 
   context 'files' do
     let(:task_definition) do
-      Opal::RSpec::RakeTask.new(task_name) do |server, task|
+      Opal::RSpec::RakeTask.new(task_name) do |_, task|
         task.files = FileList['spec/other/**/*_spec.rb']
       end
     end
@@ -192,16 +209,15 @@ describe Opal::RSpec::RakeTask do
     end
 
     it { is_expected.to have_attributes files: FileList['spec/other/**/*_spec.rb'] }
-    it { is_expected.to_not append_opal_path 'spec' }
-    it { is_expected.to append_opal_path 'spec/other' }
-    it { is_expected.to require_opal_specs eq ['dummy_spec'] }
+    it { is_expected.to append_opal_path 'spec' }
+    it { is_expected.to require_opal_specs eq ['other/dummy_spec'] }
   end
 
   context 'pattern and files' do
     let(:expected_to_run) { false }
 
     let(:task_definition) do
-      Opal::RSpec::RakeTask.new(task_name) do |server, task|
+      Opal::RSpec::RakeTask.new(task_name) do |_, task|
         task.files = FileList['spec/other/**/*_spec.rb', 'util/**/*.rb']
         task.pattern = 'spec/opal/**/*hooks_spec.rb'
       end

data/spec/mri/unit/opal/rspec/sprockets_environment_spec.rb

@@ -6,89 +6,50 @@ describe Opal::RSpec::SprocketsEnvironment do
   include_context :temp_dir
   let(:args) { [] }
   subject(:env) { Opal::RSpec::SprocketsEnvironment.new *args }
-  
+
   RSpec::Matchers.define :have_pathnames do |expected|
-    expected = expected.map {|p| File.expand_path(p) }
-    
+    expected = expected.map { |p| File.expand_path(p) }
+
     match do |actual|
       actual == expected
     end
   end
-  
+
   describe '#cached' do
     subject { env.cached }
-    
+
     it { is_expected.to be_a ::Opal::RSpec::CachedEnvironment }
   end
-  
+
   describe '#add_spec_paths_to_sprockets' do
-    let(:args) { [pattern] }
-    
+    let(:args) { [pattern, nil, nil, default_path] }
+    let(:default_path) { nil }
+
     subject do
       # in subject to allow contexts to execute before logic
       env.add_spec_paths_to_sprockets
       env.paths.sort
     end
-        
-    context 'specs all 1 in path' do
+
+    context 'default path not set' do
       before do
         create_dummy_spec_files 'spec/foobar/dummy_spec.rb', 'spec/foobar/ignored_spec.opal'
       end
-      
+
       let(:pattern) { 'spec/foobar/**/*_spec.rb' }
-      
-      it { is_expected.to have_pathnames ['spec/foobar/'] }
-    end
-    
-    context 'multiple patterns' do
-      before do
-        create_dummy_spec_files 'spec/foobar/dummy_spec.rb', 'spec/foobar/ignored_spec.opal'
-      end
-      
-      let(:pattern) { ['spec/foobar/**/*_spec.rb', 'spec/foobar/**/*_spec.opal'] }
-      
-      it { is_expected.to have_pathnames ['spec/foobar/'] }
-    end
-    
-    context 'specs in different paths, same root' do
-      before do
-        create_dummy_spec_files 'spec/foobar/dummy_spec.rb', 'spec/noway/other_spec.rb'
-      end
-      
-      let(:pattern) { ['spec/foobar/**/*y_spec.rb', 'spec/noway/**/*_spec.rb'] }      
-      
+
       it { is_expected.to have_pathnames ['spec'] }
     end
-    
-    context 'specs in different paths, different root' do
-      before do
-        create_dummy_spec_files 'spec/foobar/dummy_spec.rb', 'other_path/other_spec.rb'
-      end
-      
-      let(:pattern) { ['spec/foobar/**/*_spec.rb', 'other_path/**/*.rb'] }
-      
-      it { is_expected.to have_pathnames ['other_path/', 'spec/foobar/'] }
-    end
-    
-    context 'specs in different paths, same name in middle dirs' do
+
+    context 'default path set' do
       before do
-        create_dummy_spec_files 'foobar/spec/something/dummy_spec.rb', 'spec/foobar/other_spec.rb'
+        create_dummy_spec_files 'spec/foobar/dummy_spec.rb', 'spec/foobar/ignored_spec.opal'
       end
-      
-      let(:pattern) { ['foobar/spec/**/*_spec.rb', 'spec/foobar/other_spec.rb'] }
-      
-      it { is_expected.to have_pathnames ['foobar/spec/', 'spec/foobar'] }
+
+      let(:pattern) { 'spec/foobar/**/*_spec.rb' }
+      let(:default_path) { 'spec/foobar' }
+
+      it { is_expected.to have_pathnames ['spec/foobar'] }
     end
-    
-    context 'absolute path and relative path that are not in the same tree' do
-      before do
-        create_dummy_spec_files 'spec/foobar/dummy_spec.rb', 'stuff/bar/other_spec.rb'
-      end
-      
-      let(:files) { FileList['spec/foobar/**/*_spec.rb', 'stuff/bar/other_spec.rb'] }
-      let(:args) { [nil, nil, files] }    
-      
-      it { is_expected.to have_pathnames ['spec/foobar', 'stuff/bar'] }      
-    end   
   end
 end

data/spec/rspec/core/core_spec_loader.rb

@@ -17,6 +17,10 @@ module Opal
         [/core\/example_spec.rb/, /pending_spec.rb/]
       end
 
+      def self.default_path
+        'rspec-core/spec'
+      end
+
       def self.spec_glob
         %w{rspec-core/spec/**/*_spec.rb spec/rspec/core/opal_alternates/**/*_spec.rb}
       end

data/spec/rspec/expectations/expectation_spec_loader.rb

@@ -13,6 +13,10 @@ module Opal
         'spec/rspec/expectations'
       end
 
+      def self.default_path
+        'rspec-expectations/spec'
+      end
+
       def self.spec_glob
         %w{rspec-expectations/spec/**/*_spec.rb spec/rspec/expectations/opal_alternates/**/*_spec.rb}
       end

data/spec/rspec/mocks/filter/bugs/any_instance.rb

@@ -1,12 +1,12 @@
 rspec_filter filter '#any_instance' do
   filter '#any_instance when used after the test has finished restores the original behaviour, even if the expectation fails'
   filter '#any_instance when used after the test has finished restores the original behavior of a stubbed method'
-  filter '#any_instance when directed at a method defined on a superclass mocks the method correctly'
+  filter('#any_instance when directed at a method defined on a superclass mocks the method correctly').unless { at_least_opal_0_9? }
   filter '#any_instance when resetting post-verification existing method with stubbing private methods restores a stubbed private method after the spec is run'
   filter '#any_instance when resetting post-verification existing method with expectations private methods restores a stubbed private method after the spec is run'
   filter '#any_instance passing the receiver to the implementation block when configured to pass the instance an any instance stub does not pass the instance to and_call_original'
-  filter '#any_instance setting a message expectation with an expectation is set on a method that exists after any one instance has received a message fails if the method is invoked on a second instance'
-  filter "#any_instance setting a message expectation with an expectation is set on a method which does not exist behaves as 'exactly one instance' fails if the method is invoked on a second instance"
+  filter('#any_instance setting a message expectation with an expectation is set on a method that exists after any one instance has received a message fails if the method is invoked on a second instance').unless { at_least_opal_0_9? }
+  filter("#any_instance setting a message expectation with an expectation is set on a method which does not exist behaves as 'exactly one instance' fails if the method is invoked on a second instance").unless { at_least_opal_0_9? }
   filter('#any_instance setting a message expectation works with a SimpleDelegator subclass').unless { at_least_opal_0_9? }
   filter "#any_instance when stubbing behaves as 'every instance' handles freeze and duplication correctly"
   filter "#any_instance when stubbing behaves as 'every instance' handles method restoration on subclasses"

data/spec/rspec/mocks/mocks_spec_loader.rb

@@ -17,6 +17,10 @@ module Opal
         []
       end
 
+      def self.default_path
+        'rspec-mocks/spec'
+      end
+
       def self.spec_glob
         %w{rspec-mocks/spec/**/*_spec.rb}
       end

data/spec/rspec/opal_rspec_spec_loader.rb

@@ -102,14 +102,29 @@ module Opal
       end
 
       def append_additional_load_paths(server)
-        baseline = ['spec/rspec/shared']
+        baseline = [base_dir, 'spec/rspec/shared']
+        baseline += tmp_load_paths
         (baseline + additional_load_paths).each { |p| server.append_path p }
       end
 
+      def get_tmp_load_path_dir
+        dir = Dir.mktmpdir
+        at_exit do
+          FileUtils.remove_entry dir
+        end
+        # something was clearing this if it was added via Opal.append_path, so save it
+        tmp_load_paths << dir
+        dir
+      end
+
+      def tmp_load_paths
+        @tmp_load_paths ||= []
+      end
+
       def replace_with_regex(regex, description, starting_file_set, files_to_replace)
         fix_these_files = starting_file_set.select { |f| files_to_replace.any? { |r| r.match(f) } }
         return starting_file_set unless fix_these_files.any?
-        dir = Dir.mktmpdir
+        dir = get_tmp_load_path_dir
         missing = []
         expressions = [*regex]
         fixed_temp_files = fix_these_files.map do |path|
@@ -131,9 +146,6 @@ module Opal
           missing << path unless matching
           temp_filename
         end
-        at_exit do
-          FileUtils.remove_entry dir
-        end
         raise "Expected to #{description} in #{fix_these_files} but we didn't find any expressions in #{missing}. Check if RSpec has been upgraded" if missing.any?
         files_we_left_alone = starting_file_set - fix_these_files
         files_we_left_alone + fixed_temp_files
@@ -166,7 +178,7 @@ module Opal
         bad_regex = /^(.*)\\$/
         fix_these_files = files.select { |f| files_with_line_continue.any? { |regex| regex.match(f) } }
         return files unless fix_these_files.any?
-        dir = Dir.mktmpdir
+        dir = get_tmp_load_path_dir
         missing = []
         fixed_temp_files = fix_these_files.map do |path|
           temp_filename = File.join dir, File.basename(path)
@@ -192,9 +204,6 @@ module Opal
           missing << path unless found_blackslash
           temp_filename
         end
-        at_exit do
-          FileUtils.remove_entry dir
-        end
         raise "Expected to fix blackslash continuation in #{fix_these_files} but we didn't find any backslashes in #{missing}. Check if RSpec has been upgraded (maybe those blackslashes are gone??)" if missing.any?
         files_we_left_alone = files - fix_these_files
         files_we_left_alone + fixed_temp_files
@@ -236,6 +245,7 @@ module Opal
           task.timeout = 80000
           stub_requires
           task.files = sub_in_files
+          task.default_path = default_path
           append_additional_load_paths server
           server.debug = ENV['OPAL_DEBUG']
         end
@@ -320,8 +330,8 @@ module Opal
         rack.run Opal::Server.new(sprockets: sprockets_env) { |s|
                    s.main = 'opal/rspec/sprockets_runner'
                    stub_requires
-                   sprockets_env.add_spec_paths_to_sprockets
                    append_additional_load_paths s
+                   sprockets_env.add_spec_paths_to_sprockets
                    s.debug = ENV['OPAL_DEBUG']
                  }
       end

data/spec/rspec/support/support_spec_loader.rb

@@ -17,6 +17,10 @@ module Opal
         [/support\/method_signature_verifier_spec.rb/]
       end
 
+      def self.default_path
+        'rspec-support/spec'
+      end
+
       def self.spec_glob
         %w{rspec-support/spec/**/*_spec.rb}
       end

data/vendor/spec_runner.js

@@ -1,7 +1,8 @@
 /*
  * Test runner for phantomjs
  */
-var args = phantom.args;
+var system = require('system');
+var args = system.args.slice(1);
 var page = require('webpage').create();
 
 page.onConsoleMessage = function(msg) {
@@ -14,7 +15,6 @@ page.onInitialized = function() {
   });
 };
 
-var system = require('system');
 page.onCallback = function(data) {
   switch (data[0]) {
   case 'stdout':

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opal-rspec
 version: !ruby/object:Gem::Version
-  version: 0.5.0.beta3
+  version: 0.5.0
 platform: ruby
 authors:
 - Adam Beynon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-22 00:00:00.000000000 Z
+date: 2015-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal
@@ -761,12 +761,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: RSpec for Opal