opal-rspec 1.0.0 → 1.1.0.alpha2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c68bbe588e9f4799786a07239f9b09201d9ff8852eba3d0427d475d2c7d26eb4
-  data.tar.gz: f879318367b656f9da5068088a05093d02aa0ff30271b4886983e1f007e310ff
+  metadata.gz: daf042a48c3443b869f363a722554e1b71a3e4153f1ea6edd73562e1d0c5f6b1
+  data.tar.gz: 9e1db2043bedaa0c70c673a9485ecce6a99014db2b7f0eb51ec13d97c2b59d76
 SHA512:
-  metadata.gz: 151736466857ed69765cac6061530352e9c43a37323a0c2cc5b75acffbddf2f4cccffe5dcd6d48e6ef1aa8ac88962fe2be6f38e283758adb5a76562823faec42
-  data.tar.gz: b68d39d4ac974ccfa7893995e117329ffeaaf56e0f3999e8a39648a8d03e24e46f1bcd927df537618fba69348ccad9e576f0fae3864f95fe0a68c1e646f0133d
+  metadata.gz: c92f9b1bd05afa875b886deb5d48b81b568f5042a0d51bf82f1bbcd98c5403cc0dc69c26dc671c9fc92646adbb889771c4d1fce7e6c69fffe717f581f09be6f4
+  data.tar.gz: e5ec66ded2c2ed976a3234946efc8bb4b6a003d1dbc764831730bbd3de8cd348e1da1e3818b9777e5405b1cca743827b29ef96650cedd1fd4bd7d4875a8d336e

data/.github/workflows/build.yml

@@ -13,10 +13,11 @@ on:
 jobs:
   build:
     strategy:
+      fail-fast: false
       matrix:
         os: [ 'ubuntu-latest' ]
-        ruby: [ ruby-head, 3.1, "3.0", 2.7 ]
-        opal: [ master, 1.6.alpha1 ]
+        ruby: [ ruby-head, 3.2, 3.1, "3.0", 2.7 ]
+        opal: [ master, 1.7, 1.8 ]
 
     runs-on: ${{ matrix.os }}
 
@@ -24,7 +25,9 @@ jobs:
       OPAL_VERSION: ${{ matrix.opal }}
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
+        with:
+          submodules: true
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}

data/CHANGELOG.md

@@ -1,5 +1,27 @@
 # Opal-RSpec Changelog
 
+## 1.1.0.alpha2 - 2023-09-20
+
+- Drop advertised support for Opal v1.6
+
+- Fix support for Ruby 2.7+
+
+- Drop requirement of Opal-Sprockets
+
+
+## 1.1.0.alpha1 - 2023-09-16
+
+- Support Opal headless browser runners
+
+- (Almost) full support for `rspec` CLI util (which we run using `opal-rspec` command)
+  * Focus works, you can type `opal-rspec spec-opal-passing/tautology_spec.rb:8` to select a given test
+  * Most of other command line switches of `opal-rspec` work
+  * You can use a `.rspec-opal` configuration file akin to `.rspec` with the regular RSpec
+    * Just like with RSpec, switches set in this file propagate everywhere (eg. Rake task), so this is from now a prefered place to set up paths, etc.
+
+- Compatibility for upcoming Opal v1.8
+
+
 ## 1.0.0 - 2022-11-24
 
 - Drop support for anything below Opal v1.6.alpha1

data/Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 gemspec
 
-unless Dir['rspec{,-{core,expectations,mocks,support}}/upstream'].any?
+unless Dir[__dir__ + '/rspec{,-{core,expectations,mocks,support}}/upstream'].any?
   raise 'Run: "git submodule update --init" to get RSpec sources'
 end
 
@@ -18,7 +18,7 @@ case ENV['OPAL_VERSION']
 when 'local'
   gem 'opal', path: '../opal'
 when /^[0-9]/
-  gem 'opal', ENV['OPAL_VERSION']
+  gem 'opal', "~> #{ENV['OPAL_VERSION']}.0a"
 when String
   gem 'opal', git: 'https://github.com/opal/opal.git', branch: ENV['OPAL_VERSION']
 end
@@ -26,3 +26,4 @@ end
 gem 'opal-sprockets', '>=1.0'
 
 gem 'puma'
+gem 'rack', '<3'

data/README.md

@@ -135,6 +135,10 @@ end
 
 If you don't specify a runner using `task.runner`, a default one is Node. In this case you can also use `RUNNER=chrome` to run a particular test with Headless Chromium.
 
+*(since v1.1.0)*
+
+You can also put default options into an `.rspec-opal` file, akin to how RSpec works. Those options will be propagated to Rake task, invocations of `Opal::RSpec::Runner` and also the `opal-rspec` command line tool.
+
 ### Run specs in Node.js
 
 Same options as above, you can use the `RUNNER=node` environment variable
@@ -157,6 +161,11 @@ Opal::RSpec::RakeTask.new(:default) do |server, task|
 end
 ```
 
+*(since v1.1.0)*
+
+While `server` value runs a server, you can here supply also respectively
+`chrome`, `firefox` or `safari` to run the test using a headless browser.
+
 ### Run specs in a browser (Sprockets, deprecated)
 
 `opal-rspec` can use sprockets to build and serve specs over a simple rack
@@ -347,7 +356,7 @@ When updating the RSpec versions, after updating the submodule revisions, you ma
 
 (The MIT License)
 
-Copyright (C) 2022 by hmdne and the Opal contributors
+Copyright (C) 2022-2023 by hmdne and the Opal contributors
 Copyright (C) 2015 by Brady Wied
 Copyright (C) 2013 by Adam Beynon
 

data/exe/opal-rspec

@@ -4,81 +4,23 @@
 
 require 'rake'
 require 'opal/rspec/runner'
+require 'opal/rspec/configuration_parser'
 
 require 'shellwords'
-require 'optparse'
 
-options = {}
-OptionParser.new do |parser|
-  parser.on('--init', 'Initialize your project with Opal-RSpec.') do |_cmd|
-    Opal::RSpec::ProjectInitializer.new.run
-    exit
-  end
-
-  parser.on('-c', '--[no-]color', '--[no-]colour', 'Enable color in the output.') do |o|
-    options[:color] = o
-  end
-
-  parser.on('-f', '--format FORMATTER', 'Choose a formatter.',
-            '  [p]rogress (default - dots)',
-            '  [d]ocumentation (group and example names)',
-            '  [h]tml',
-            '  [j]son',
-            '  custom formatter class name') do |o|
-    options[:formatters] ||= []
-    options[:formatters] << [o]
-  end
-
-  parser.on('-r', '--require PATH', 'Require a file.') do |path|
-    options[:requires] ||= []
-    options[:requires] << path
-  end
-
-  parser.on('-I PATH', 'Specify PATH to add to $LOAD_PATH (may be used more than once).') do |dir|
-    options[:includes] ||= []
-    options[:includes] << dir
-  end
-
-  parser.on('-P', '--pattern PATTERN', 'Load files matching pattern (default: "spec-opal/**/*_spec.rb").') do |o|
-    options[:pattern] = o
-  end
-
-  parser.on('--default-path PATH', 'Set the default path where RSpec looks for examples (can',
-            '  be a path to a file or a directory).') do |path|
-    options[:default_path] = path
-  end
-
-  parser.separator 'Opal specific options:'
-
-  parser.on('-R', '--runner NAME', 'Use a different JS runner (default is nodejs)') do |name|
-    options[:runner] = name
-  end
-end.parse!
-
-runner = Opal::RSpec::Runner.new do |server, config|
-  spec_opts = []
-  spec_opts += ['--color', options[:color]] if options[:color]
-  options[:requires].each {|req| spec_opts += ['-r', req]} if options[:requires]
-  raise "can accept only one formatter at this time" if options[:formatters] && options[:formatters].size != 1
-  spec_opts += ['--format', options[:formatters].flatten.first] if options[:formatters]
-  raw_files = ARGV
-  raw_files = ['spec-opal'] if raw_files.empty?
+parser = Opal::RSpec::Core::Parser.new(ARGV)
+options = parser.parse
 
-  files = raw_files.flat_map do |file|
-    if File.directory? file
-      Dir[File.join(file, '**{,/*/**}/*_spec{.js,}.rb')]
-    elsif File.file? file
-      file
-    else
-      raise "Can't stat path: #{file}"
-    end
+case options[:runner]
+when String, nil
+  runner = Opal::RSpec::Runner.new do |server, config|
+    config.runner       = options.delete(:runner)
+    config.spec_opts    = options
   end
 
-  options[:includes].each {|dir| server.append_path dir} if options[:includes]
-  config.default_path = options[:default_path]           if options[:default_path]
-  config.spec_opts    = spec_opts.shelljoin
-  config.files        = files
+  runner.run
+else
+  exit options[:runner].(ARGV, $stderr, $stdout)
 end
 
-runner.run
 

data/lib/opal/rspec/configuration_parser.rb

@@ -0,0 +1,47 @@
+require 'opal/rspec/util'
+require 'optparse'
+
+module Opal; module RSpec; module Core; end; end; end
+# Load necessary files under Opal's namespace, so as not to conflict with RSpec if it's being loaded too.
+# Later, we will monkey-patch those methods.
+::Opal::RSpec.load_namespaced __dir__ + "/../../../rspec-core/upstream/lib/rspec/core/invocations.rb", ::Opal
+::Opal::RSpec.load_namespaced __dir__ + "/../../../rspec-core/upstream/lib/rspec/core/option_parser.rb", ::Opal
+
+class Opal::RSpec::Core::Parser
+  alias parser_before_opal parser
+
+  def parser(options)
+    parser_before_opal(options).tap do |parser|
+      parser.banner = "Usage: opal-rspec [options] [files or directories]\n\n"
+
+      parser.separator ''
+      parser.separator '  **** Opal specific options ****'
+      parser.separator ''
+
+      parser.on('-R', '--runner NAME', 'Use a different JS runner (default is nodejs)') do |name|
+        options[:runner] = name
+      end
+
+      parser.separator ''
+      parser.separator '  **** Help ****'
+      parser.separator ''
+    end
+  end
+end
+
+class Opal::RSpec::Core::Invocations::PrintVersion
+  alias call_before_opal call
+
+  def call(options, err, out)
+    exitcode = call_before_opal(options, err, out)
+    out.puts "Opal #{Opal::VERSION}"
+    out.puts "  - opal-rspec #{Opal::RSpec::VERSION}"
+    exitcode
+  end
+end
+
+module Opal::RSpec::Support
+  def self.require_rspec_core(arg)
+    require "opal/rspec/"+arg
+  end
+end

data/lib/opal/rspec/locator.rb

@@ -1,25 +1,33 @@
+require 'opal/rspec/util'
 require 'pathname'
 require 'rake'
 # 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/upstream/lib/rspec/core/ruby_project'
+::Opal::RSpec.load_namespaced __dir__+'/../../../rspec-core/upstream/lib/rspec/core/ruby_project.rb', ::Opal
 
 module Opal
   module RSpec
     class Locator
-      include ::RSpec::Core::RubyProject
+      include ::Opal::RSpec::Core::RubyProject
 
       DEFAULT_GLOB = '**{,/*/**}/*_spec{.js,}.{rb,opal}'
-      DEFAULT_PATTERN = "spec-opal/#{DEFAULT_GLOB}"
       DEFAULT_DEFAULT_PATH = 'spec-opal'
 
       attr_accessor :spec_pattern, :spec_exclude_pattern, :spec_files, :default_path
 
       def initialize(pattern: nil, exclude_pattern: nil, files: nil, default_path: nil)
-        @spec_pattern         = pattern || DEFAULT_PATTERN
-        @spec_exclude_pattern = exclude_pattern
+        @spec_exclude_pattern = Array(exclude_pattern)
         @spec_files           = files
         @default_path         = default_path || DEFAULT_DEFAULT_PATH
+        @spec_pattern         = Array(pattern || DEFAULT_GLOB)
+
+        @spec_pattern = @spec_pattern.map do |pattern|
+          pattern.sub(/\A#{Regexp.escape(@default_path)}/, '')
+        end
+
+        @spec_exclude_pattern = @spec_exclude_pattern.map do |pattern|
+          pattern.sub(/\A#{Regexp.escape(@default_path)}/, '')
+        end
       end
 
       def determine_root
@@ -27,11 +35,28 @@ module Opal
       end
 
       def get_spec_load_paths
-        [@default_path].map { |dir| File.join(root, dir) }
+        [File.join(root, @default_path)]
+      end
+
+      def get_matching_files_under(path: )
+        FileList[*@spec_pattern.map { |i| "#{path}/#{i}" }]
+          .exclude(*@spec_exclude_pattern.map { |i| "#{path}/#{i}" })
       end
 
       def get_opal_spec_requires
-        files = @spec_files || FileList[*@spec_pattern].exclude(*@spec_exclude_pattern)
+        if !@spec_files || @spec_files.empty?
+          files = get_matching_files_under(path: @default_path)
+        else
+          files = @spec_files.map do |file|
+            file = file.split(/[\[:]/).first
+            if File.directory?(file)
+              get_matching_files_under(path: file).to_a
+            else
+              file
+            end
+          end.flatten
+          files = FileList[*files]
+        end
         files.uniq.map { |file| File.expand_path file }
       end
     end

data/lib/opal/rspec/project_initializer/.rspec-opal

@@ -1,2 +1 @@
---color
 --require spec_helper

data/lib/opal/rspec/project_initializer/spec-opal/spec_helper.rb

@@ -1,4 +1,88 @@
+# This file was generated by the `opal-rspec --init` command. Conventionally, all
+# specs live under a `spec-opal` directory, which RSpec adds to the `$LOAD_PATH`.
+# The generated `.rspec-opal` file contains `--require spec_helper` which will cause
+# this file to always be loaded, without a need to explicitly require it in any
+# files.
+#
+# Given that it is always loaded, you are encouraged to keep this file as
+# light-weight as possible. Requiring heavyweight dependencies from this file
+# will add to the boot time of your test suite on EVERY test run, even for an
+# individual file that may not need all of that loaded. Instead, consider making
+# a separate helper file that requires the additional dependencies and performs
+# the additional setup, and require it from the spec files that actually need
+# it.
+#
+# See https://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
+  # rspec-expectations config goes here. You can use an alternate
+  # assertion/expectation library such as wrong or the stdlib/minitest
+  # assertions if you prefer.
+  config.expect_with :rspec do |expectations|
+    # This option will default to `true` in RSpec 4. It makes the `description`
+    # and `failure_message` of custom matchers include text for helper methods
+    # defined using `chain`, e.g.:
+    #     be_bigger_than(2).and_smaller_than(4).description
+    #     # => "be bigger than 2 and smaller than 4"
+    # ...rather than:
+    #     # => "be bigger than 2"
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
+
+  # rspec-mocks config goes here. You can use an alternate test double
+  # library (such as bogus or mocha) by changing the `mock_with` option here.
+  config.mock_with :rspec do |mocks|
+    # Prevents you from mocking or stubbing a method that does not exist on
+    # a real object. This is generally recommended, and will default to
+    # `true` in RSpec 4.
+    mocks.verify_partial_doubles = true
+  end
+
+  # This option will default to `:apply_to_host_groups` in RSpec 4 (and will
+  # have no way to turn it off -- the option exists only for backwards
+  # compatibility in RSpec 3). It causes shared context metadata to be
+  # inherited by the metadata hash of host groups and examples, rather than
+  # triggering implicit auto-inclusion in groups with matching metadata.
+  config.shared_context_metadata_behavior = :apply_to_host_groups
+
+# The settings below are suggested to provide a good initial experience
+# with RSpec, but feel free to customize to your heart's content.
+=begin
+  # This allows you to limit a spec run to individual examples or groups
+  # you care about by tagging them with `:focus` metadata. When nothing
+  # is tagged with `:focus`, all examples get run. RSpec also provides
+  # aliases for `it`, `describe`, and `context` that include `:focus`
+  # metadata: `fit`, `fdescribe` and `fcontext`, respectively.
+  config.filter_run_when_matching :focus
+
+  # Allows RSpec to persist some state between runs in order to support
+  # the `--only-failures` and `--next-failure` CLI options. We recommend
+  # you configure your source control system to ignore this file.
+  config.example_status_persistence_file_path = "spec/examples.txt"
+
+  # Limits the available syntax to the non-monkey patched syntax that is
+  # recommended. For more details, see:
+  # https://relishapp.com/rspec/rspec-core/docs/configuration/zero-monkey-patching-mode
+  config.disable_monkey_patching!
+
+  # This setting enables warnings. It's recommended, but in some cases may
+  # be too noisy due to issues in dependencies.
+  config.warnings = true
+
+  # Many RSpec users commonly either run the entire suite or an individual
+  # file, and it's useful to allow more verbose output when running an
+  # individual spec file.
+  if config.files_to_run.one?
+    # Use the documentation formatter for detailed output,
+    # unless a formatter has already been configured
+    # (e.g. via a command-line flag).
+    config.default_formatter = "doc"
+  end
+
+  # Print the 10 slowest examples and example groups at the
+  # end of the spec run, to help surface which specs are running
+  # particularly slow.
+  config.profile_examples = 10
+
   # 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.
@@ -10,4 +94,5 @@ RSpec.configure do |config|
   # test failures related to randomization by passing the same `--seed` value
   # as the one that triggered the failure.
   Kernel.srand config.seed
+=end
 end

data/lib/opal/rspec/project_initializer.rb

@@ -19,6 +19,17 @@ module Opal
       end
 
       def run
+        puts <<~EOF
+          ** Do note, that Opal-RSpec defaults to the following paths:
+          ** - config file:    .rspec-opal
+          ** - spec directory: spec-opal
+          ** - program:        lib-opal
+          **
+          ** If you want to share Opal specs with Ruby specs, you will
+          ** need to put the following into your .rspec-opal:
+          **
+          ** -Ilib --default-path=spec
+        EOF
         copy_template DOT_RSPEC_FILE
         copy_template SPEC_HELPER_FILE
       end

data/lib/opal/rspec/runner.rb

@@ -9,7 +9,24 @@ require 'opal/rspec/locator'
 module Opal
   module RSpec
     class Runner
-      attr_accessor :pattern, :requires, :exclude_pattern, :files, :default_path, :runner, :arity_checking, :spec_opts, :cli_options
+      attr_accessor :runner, :arity_checking, :spec_opts, :cli_options, :files
+
+      # Delegate property changes to spec_opts
+      def self.spec_opts_accessor(*names)
+        names.each do |name|
+          define_method name do
+            spec_opts[name]
+          end
+          define_method :"#{name}=" do |value|
+            spec_opts[name] = value
+          end
+        end
+      end
+
+      spec_opts_accessor :libs, :requires, :pattern, :exclude_pattern, :default_path, :files_or_directories_to_run
+
+      alias files files_or_directories_to_run
+      alias files= files_or_directories_to_run=
 
       def timeout= _
         warn "deprecated: setting timeout has no effect"
@@ -33,11 +50,11 @@ module Opal
       end
 
       def requires
-        @requires ||= []
+        spec_opts[:requires] ||= []
       end
 
       def spec_opts
-        @spec_opts ||= ENV['SPEC_OPTS']
+        @spec_opts = Opal::RSpec.convert_spec_opts(@spec_opts)
       end
 
       def get_load_asset_code(server)
@@ -80,9 +97,16 @@ module Opal
         @legacy_server_proxy = LegacyServerProxy.new
         block.call(@legacy_server_proxy, self) if block_given? # for compatibility
 
-        raise 'Cannot supply both a pattern and files!' if self.files and self.pattern
+        raise 'Cannot supply both a pattern and files!' if self.files \
+                                                        && !self.files.empty? \
+                                                        && self.pattern
 
-        locator = ::Opal::RSpec::Locator.new pattern: self.pattern, exclude_pattern: self.exclude_pattern, files: self.files, default_path: self.default_path
+        append_opts_from_config_file
+
+        locator = ::Opal::RSpec::Locator.new pattern: self.pattern,
+                                             exclude_pattern: self.exclude_pattern,
+                                             files: self.files,
+                                             default_path: self.default_path
 
         options = []
         options << '--arity-check' if arity_checking?
@@ -93,21 +117,55 @@ module Opal
         options << '--missing-require=ignore'
         options += @legacy_server_proxy.to_cli_options
 
-        Opal.paths.each                     { |p| options << "-I#{p}" }
-        locator.get_spec_load_paths.each    { |p| options << "-I#{p}" }
+        load_paths = [Opal.paths, locator.get_spec_load_paths, self.libs].compact.sum([]).uniq
+
+        load_paths.each                     { |p| options << "-I#{p}" }
         requires.each                       { |p| options << "-r#{p}" }
-        locator.get_opal_spec_requires.each { |p| options << "-r#{p}" }
+        locator.get_opal_spec_requires.each { |p| options << "-p#{p}" }
         ::Opal::Config.stubbed_files.each   { |p| options << "-s#{p}" }
 
         options += @cli_options if @cli_options
-        bootstrap_code = [
-          ::Opal::RSpec.spec_opts_code(spec_opts),
-          '::RSpec::Core::Runner.autorun',
-        ].join(';')
+
+        bootstrap_code = ::Opal::RSpec.spec_opts_code(spec_opts)
 
         @args = "#{options.map(&:shellescape).join ' '} -e #{bootstrap_code.shellescape}"
       end
 
+      def append_opts_from_config_file
+        self.libs ||= []
+        self.requires ||= []
+
+        config_location = nil
+        path = self.default_path || "spec-opal"
+
+        # Locate config file
+        begin
+          loop do
+            if File.exist?(File.join(path, ".rspec-opal"))
+              path = File.join(path, ".rspec-opal")
+              break
+            else
+              new_path = File.expand_path("..", path)
+              return if new_path == path
+              path = new_path
+            end
+          end
+        rescue e
+          # we've gone too far beyond our permissions without finding a config file
+          return
+        end
+
+        if path
+          config_opts = Opal::RSpec.convert_spec_opts(File.read(path))
+        else
+          return
+        end
+
+        self.spec_opts = config_opts.merge(spec_opts) do |key, oldval, newval|
+          [:libs, :requires].include?(key) ? oldval + newval : newval
+        end
+      end
+
       def options
         {
           pattern: pattern,

data/lib/opal/rspec/util.rb

@@ -0,0 +1,15 @@
+module ::Opal
+  module RSpec
+    def self.load_namespaced(file, mod)
+      if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.1")
+        load file, mod
+      else
+        str = ""
+        str += "module ::#{mod.name};"
+        str += File.read(file)
+        str += ";end"
+        eval(str)
+      end
+    end
+  end
+end

data/lib/opal/rspec/version.rb

@@ -1,5 +1,12 @@
+require 'opal/rspec/util'
+
 module Opal
   module RSpec
-    VERSION = '1.0.0'
+    VERSION = '1.1.0.alpha2'
   end
 end
+
+::Opal::RSpec.load_namespaced __dir__ + "/../../../rspec-core/upstream/lib/rspec/core/version.rb", ::Opal
+::Opal::RSpec.load_namespaced __dir__ + "/../../../rspec-expectations/upstream/lib/rspec/expectations/version.rb", ::Opal
+::Opal::RSpec.load_namespaced __dir__ + "/../../../rspec-mocks/upstream/lib/rspec/mocks/version.rb", ::Opal
+::Opal::RSpec.load_namespaced __dir__ + "/../../../rspec-support/upstream/lib/rspec/support/version.rb", ::Opal

data/lib/opal/rspec.rb

@@ -1,7 +1,7 @@
 require 'opal'
-require 'opal-sprockets'
 require 'opal/rspec/version'
 require 'opal/rspec/runner'
+require 'opal/rspec/configuration_parser'
 
 # Just register our opal code path with opal build tools
 Opal.append_path File.expand_path('../../../lib-opal', __FILE__)
@@ -19,32 +19,31 @@ module Opal
   module RSpec
     autoload :ProjectInitializer, 'opal/rspec/project_initializer'
 
+    def self.convert_spec_opts(opts)
+      opts ||= ENV['SPEC_OPTS'] || {}
+
+      unless opts.is_a? Hash
+        opts = Shellwords.split(opts) if opts.is_a? String
+        opts = Opal::RSpec::Core::Parser.parse(opts || [])
+      end
+
+      opts
+    end
+
     def self.spec_opts_code(spec_opts)
+      spec_opts = convert_spec_opts(spec_opts)
+
       code = []
-      if spec_opts && !spec_opts.empty?
-        code << 'RSpec.configure do |config|'
-
-        if (match = /--(no-)?color\b/.match(spec_opts))
-          color_value = !match.captures[0]
-          # Have to use instance_variable_set because config.color= is designed to not allow overriding color once it's set, but
-          # we do not yet have true SPEC_OPTS parsing via RSpec config to get it initially set
-          code << "config.instance_variable_set(:@color, #{color_value})"
-        end
-
-        if (requires = spec_opts.scan(/(?:--require|-r) \S+/)).any?
-          requires.map {|r| /--require (.*)/.match(r).captures[0]}.each do |req|
-            code << %{require "#{req}"}
-          end
-        end
-
-        if (match = /--format (\S+)/.match(spec_opts))
-          formatter = match.captures[0]
-          code << %{config.formatter = "#{formatter}"}
-        end
-
-        code << 'end'
-      end
-      code.join('; ')
+      code << '# await: true'
+
+      # New API - passthru options
+      spec_opts[:files_or_directories_to_run] ||= []
+
+      code << "$rspec_opts = #{spec_opts.inspect}"
+      code << "$0 = 'opal-rspec'"
+
+      code << '::RSpec::Core::Runner.invoke.__await__'
+      code.join("\n")
     end
   end
 end

data/lib-opal/opal/rspec/browser.rb

@@ -1,5 +1,9 @@
 require 'opal/rspec/formatter/browser_formatter'
 
 RSpec.configure do |config|
-  config.default_formatter = ::Opal::RSpec::BrowserFormatter
+  if OPAL_PLATFORM.nil?
+    # We want the browser formatter ONLY for the real browser, not
+    # our headless browser runners.
+    config.default_formatter = ::Opal::RSpec::BrowserFormatter
+  end
 end

data/lib-opal/opal/rspec/fixes/rspec/core/configuration.rb

@@ -1,20 +1,112 @@
-class ::RSpec::Core::Configuration
-  # This needs to be implemented if/when we allow the Opal side to decide what files to run
+# backtick_javascript: true
+
+require 'rspec/core/configuration'
+
+module ::RSpec; module Core; class Configuration
   def files_or_directories_to_run=(*files)
-    @files_or_directories_to_run = []
+    files = files.flatten
+
+    # patch: rspec -> opal-rspec
+    if (command == 'opal-rspec' || Runner.running_in_drb?) && default_path && files.empty?
+      files << default_path
+    end
+
+    @files_or_directories_to_run = files
     @files_to_run = nil
   end
 
   def requires=(paths)
     # can't change requires @ this stage, this method calls RubyProject which will crash on Opal
   end
-end
+
+  def remove_ruby_ext(str)
+    str.gsub(/(?:\.js)?\.(?:rb|opal|\{rb,opal\})\z/, '')
+  end
+
+  def glob_to_re(path, pattern)
+    pattern = remove_ruby_ext(pattern)
+    path = "" if pattern.start_with?(path)
+    path += "/" unless path.end_with?("/")
+    re = Regexp.escape(pattern).gsub('\*\*', '.*?')
+                               .gsub('\*', '[^/]*?')
+                               .gsub('\?', '[^/]')
+                               .gsub(/\\{(.*?)\\}/) {
+                                 '(?:' + $1.gsub(",", "|") + ')'
+                               }
+    re = "(?:^|/)" + Regexp.escape(path) + re + "$"
+    # Strip the first `/` so it acts more like the intention of `**`
+    re = re.gsub("/.*?", ".*?")
+    # Strip the `/./`
+    re = re.gsub("/\\.\\/", "\\/")
+    re = re.gsub("/)\\.\\/", "\\/)")
+    Regexp.new(re)
+  end
+
+  # Only load from loaded files
+  def get_matching_files(path, pattern)
+    `Object.keys(Opal.modules)`.grep(glob_to_re(path, pattern)).sort
+  end
+
+  # A crude logic to check if a path is a directory perhaps...
+  # This ought to work in places where we don't have a filesystem.
+  def is_directory?(path)
+    return true if path.end_with? '/'
+    # This is passed with ":" if we run something like:
+    # opal-rspec spec-opal-passing/tautology_spec.rb:8
+    return false if path =~ /\[[0-9:]+\]$|:[0-9]+$/
+    # Ruby files are certainly not directories
+    return false if ['.rb', '.opal'].any? { |i| path.end_with? i }
+    # Otherwise, let's check for modules
+    !`Object.keys(Opal.modules)`.any? { |i| i.end_with?("/"+remove_ruby_ext(path)) }
+  end
+
+  def get_files_to_run(paths)
+    files = paths_to_check(paths).flat_map do |path|
+      path = path.gsub(File::ALT_SEPARATOR, File::SEPARATOR) if File::ALT_SEPARATOR
+      is_directory?(path) ? gather_directories(path) : extract_location(path)
+    end.uniq
+
+    return files unless only_failures?
+    relative_files = files.map { |f| Metadata.relative_path(File.expand_path f) }
+    intersection = (relative_files & spec_files_with_failures.to_a)
+    intersection.empty? ? files : intersection
+  end
+
+  def opal_special_load(file)
+    file = remove_ruby_ext(file)
+    long_file = `Object.keys(Opal.modules)`.find { |i| i.end_with?(file) }
+    `Opal.modules[file] = Opal.modules[long_file]` if long_file
+
+    # Let's try a normalized load
+    `Opal.load_normalized(file)`
+  rescue LoadError
+    # Otherwise, a regular require
+    require file
+  end
+
+  alias load_file_handling_errors_before_opal load_file_handling_errors
+
+  def load_file_handling_errors(method, file)
+    load_file_handling_errors_before_opal(:opal_special_load, file)
+  end
+end; end; end
 
 class ::RSpec::Core::ConfigurationOptions
+  # Opal-RSpec should work without need of filesystem
+  # access, therefore we can't support access to the
+  # options file.
   def options_file_as_erb_string(path)
     # ERB.new(File.read(path), nil, '-').result(binding)
     # ERB.new(File.read(path), nil, '-')
     ''
   end
+
+  # Pass command line options directly
+  def command_line_options
+    $rspec_opts || {}
+  end
 end
 
+# Set the default path to spec-opal, to be overwritten
+# later.
+RSpec.configuration.default_path = "spec-opal"

data/lib-opal/opal/rspec/fixes/rspec/core/ordering/random.rb

@@ -1,3 +1,5 @@
+# backtick_javascript: true
+
 # Random causes problems that can lock up a browser (see README)
 class ::RSpec::Core::Ordering::Random
   HIDE_RANDOM_WARNINGS = false

data/lib-opal/opal/rspec/formatter/document_io.rb

@@ -1,3 +1,5 @@
+# backtick_javascript: true
+
 module Opal
   module RSpec
     class DocumentIO < IO

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

@@ -1,3 +1,5 @@
+# backtick_javascript: true
+
 module Opal
   module RSpec
     class Element

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

@@ -1,3 +1,5 @@
+# backtick_javascript: true
+
 require_relative 'noop_flush_string_io'
 require_relative 'element'
 

data/lib-opal/opal/rspec/sprockets_runner.rb.erb

@@ -1,3 +1,5 @@
+# await: true
+
 # This file is used by Opal::Server to basically load all spec files that
 # can be found in the spec/ directory.
 
@@ -10,5 +12,5 @@ require <%= s.inspect %>
 <% end %>
 require 'opal/rspec/spec_opts'
 
-::RSpec::Core::Runner.autorun
+::RSpec::Core::Runner.invoke.__await__
 ::Kernel.exit

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opal-rspec
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0.alpha2
 platform: ruby
 authors:
 - Adam Beynon
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-11-24 00:00:00.000000000 Z
+date: 2023-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal
@@ -294,6 +294,7 @@ files:
 - lib/opal-rspec.rb
 - lib/opal/rspec.rb
 - lib/opal/rspec/cached_environment.rb
+- lib/opal/rspec/configuration_parser.rb
 - lib/opal/rspec/locator.rb
 - lib/opal/rspec/project_initializer.rb
 - lib/opal/rspec/project_initializer/.rspec-opal
@@ -302,6 +303,7 @@ files:
 - lib/opal/rspec/runner.rb
 - lib/opal/rspec/sprockets.rb
 - lib/opal/rspec/sprockets_environment.rb
+- lib/opal/rspec/util.rb
 - lib/opal/rspec/version.rb
 - opal-rspec.gemspec
 - rspec-core/upstream/.document
@@ -951,11 +953,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: RSpec for Opal