opal-rspec 0.6.2 → 0.7.0.rc.1

data/lib-opal/opal/rspec/async/reporter.rb

@@ -0,0 +1,17 @@
+class ::RSpec::Core::Reporter
+  def report(expected_example_count)
+    # WAS:
+    #   start(expected_example_count)
+    #   begin
+    #     yield self
+    #   ensure
+    #     finish
+    #   end
+    # NOW:
+    start(expected_example_count)
+    yield(self).ensure do |result|
+      finish
+      result
+    end
+  end
+end

data/lib-opal/opal/rspec/async/runner.rb

@@ -0,0 +1,44 @@
+module ::RSpec::Core
+  class Runner
+
+    # Runs the suite of specs and exits the process with an appropriate exit code.
+    def self.invoke
+      disable_autorun!
+      # WAS:
+      #   status = run(ARGV, $stderr, $stdout).to_i
+      #   exit(status) if status != 0
+      # NOW:
+      run(ARGV, $stderr, $stdout).then do |status|
+        status = status.to_i
+        exit(status) if status != 0
+      end
+    end
+
+    def run_specs(example_groups)
+      @configuration.reporter.report(@world.example_count(example_groups)) do |reporter|
+        hook_context = SuiteHookContext.new
+
+        Promise.value(true).then do
+          @configuration.hooks.run(:before, :suite, hook_context)
+
+          # WAS: example_groups.map { |g| g.run(reporter) }.all? ? 0 : @configuration.failure_exit_code
+          results = []
+          example_groups.inject(Promise.value(true)) do |previous_promise, group|
+            previous_promise.then do |result|
+              results << result
+              group.run reporter
+            end
+          end.then do |result|
+            results << result
+            results.all? ? 0 : @configuration.failure_exit_code
+          end
+
+        end.ensure do |result|
+          @configuration.hooks.run(:after, :suite, hook_context)
+          result
+        end
+      end
+    end
+
+  end
+end

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

@@ -0,0 +1,3 @@
+require 'opal'
+require 'opal-rspec'
+::RSpec::Core::Runner.autorun

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

@@ -0,0 +1,13 @@
+require 'opal/rspec/formatter/browser_formatter'
+
+RSpec.configure do |config|
+  config.default_formatter = ::Opal::RSpec::BrowserFormatter
+end
+
+# Trigger #at_exit callbacks once the DOM is ready
+kernel_exit = Kernel.method(:exit).to_proc
+if JS[:document].JS[:readyState] == :complete
+  JS[:setTimeOut].call(kernel_exit, 1)
+else
+  JS[:document].JS.addEventListener('DOMContentLoaded', kernel_exit, false)
+end

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

@@ -0,0 +1,12 @@
+RSpec.configure do |config|
+  config.default_formatter = ::RSpec::Core::Formatters::ProgressFormatter
+
+  # # Have to do this in 2 places. This will ensure the default formatter gets the right IO, but need to do this here for custom formatters
+  # # that will be constructed BEFORE Runner.autorun runs (see runner.rb)
+  # config.output_stream = $stdout
+
+  # This shouldn't be in here, but RSpec uses undef to change this configuration and that doesn't work well enough yet
+  config.expect_with :rspec do |c|
+    c.syntax = [:should, :expect]
+  end
+end

data/{opal/opal/rspec/fixes/opal/compatibility.rb → lib-opal/opal/rspec/fixes/opal.rb}

@@ -1,3 +1,37 @@
+class IO
+  def closed?
+    true
+  end
+end
+
+Errno::ENOTDIR = Class.new(SystemCallError)
+
+require 'nodejs' if OPAL_PLATFORM == 'nodejs'
+# class Dir
+#   def self.mkdir(path)
+#
+#   end
+# end
+
+module Kernel
+  def trap(sig, &block)
+  end
+end
+
+# class File
+#   def self.directory? path
+#     return false unless exist? path
+#     `return executeIOAction(function(){return !!__fs__.lstatSync(__fs__.realPathSync(path)).isDirectory()})`
+#   end
+# end
+
+require 'js'
+
+# TODO: backport this to opal
+def JS.[](name)
+  `Opal.global[#{name}]`
+end unless JS.respond_to? :[]
+
 module Opal
   module RSpec
     module Compatibility
@@ -48,3 +82,4 @@ module Opal
     end
   end
 end
+

data/{opal → lib-opal}/opal/rspec/fixes/rspec/core/configuration.rb

@@ -9,3 +9,12 @@ class ::RSpec::Core::Configuration
     # can't change requires @ this stage, this method calls RubyProject which will crash on Opal
   end
 end
+
+class ::RSpec::Core::ConfigurationOptions
+  def options_file_as_erb_string(path)
+    # ERB.new(File.read(path), nil, '-').result(binding)
+    # ERB.new(File.read(path), nil, '-')
+    ''
+  end
+end
+

data/lib-opal/opal/rspec/fixes/rspec/core/formatters/json_formatter.rb

@@ -0,0 +1,15 @@
+class ::RSpec::Core::Formatters::JsonFormatter
+  # def close(_notification)
+  #   output.write @output_hash.to_json
+  #   output.close if IO === output && output != $stdout
+  # end
+  #
+  # def close(_notification)
+  #   output.write @output_hash.to_json
+  #   # JSON formatter does not look @ closed? and we need it to, otherwise Phantom freezes
+  #   return unless IO === output
+  #   return if output.closed? || output == $stdout
+  #
+  #   output.close
+  # end
+end

data/{opal → lib-opal}/opal/rspec/fixes/rspec/core/formatters/loader.rb

@@ -15,6 +15,12 @@ class ::RSpec::Core::Formatters::Loader
     word.downcase
   end
 
+  alias add_without_fix add
+  def add(formatter_to_use, *paths)
+    paths = paths.map{|p| String === p ? file_at(p) : p }
+    add_without_fix(formatter_to_use, *paths)
+  end
+
   def custom_formatter(formatter_ref)
     if Class === formatter_ref
       formatter_ref

data/lib-opal/opal/rspec/fixes/rspec/core/notifications/summary_notification.rb

@@ -0,0 +1,21 @@
+# string mutations
+::RSpec::Core::Notifications::SummaryNotification.class_eval do
+  def totals_line
+    summary = ::RSpec::Core::Formatters::Helpers.pluralize(example_count, "example")
+    summary += ", " + ::RSpec::Core::Formatters::Helpers.pluralize(failure_count, "failure")
+    summary += ", #{pending_count} pending" if pending_count > 0
+    summary
+  end
+
+  def fully_formatted(colorizer=::RSpec::Core::Formatters::ConsoleCodes)
+    formatted = "\nFinished in #{formatted_duration} " \
+                "(files took #{formatted_load_time} to load)\n" \
+                "#{colorized_totals_line(colorizer)}\n"
+
+    unless failed_examples.empty?
+      formatted += colorized_rerun_commands(colorizer) + "\n"
+    end
+
+    formatted
+  end
+end

data/{opal → lib-opal}/opal/rspec/fixes/rspec/core/warnings.rb

@@ -1,5 +1,7 @@
 # not 100% sure this compat check fixes this, but it's pretty close
 unless Opal::RSpec::Compatibility.multiple_module_include_super_works_right?
+  require 'opal/rspec/fixes/rspec/support/warnings'
+
   module ::RSpec::Core::Warnings
     def warn_with(message, options={})
       if options[:use_spec_location_as_call_site]
@@ -12,7 +14,14 @@ unless Opal::RSpec::Compatibility.multiple_module_include_super_works_right?
 
       # super won't find this
       # super(message, options)
-      support_warn_with message, options
+      # let's inline the method
+      call_site = options.fetch(:call_site) { ::RSpec::CallerFilter.first_non_rspec_line }
+      # mutable strings
+      # message << " Use #{options[:replacement]} instead." if options[:replacement]
+      message += " Use #{options[:replacement]} instead." if options[:replacement]
+      # message << " Called from #{call_site}." if call_site
+      message += " Called from #{call_site}." if call_site
+      ::Kernel.warn message
     end
   end
 end

data/lib-opal/opal/rspec/fixes/rspec/mocks/space.rb

@@ -0,0 +1,41 @@
+require 'rspec/mocks/verifying_double'
+
+# Opal does not support ObjectSpace, so force object __id__'s
+module RSpec::Mocks
+  class Space
+    OPAL_NON_MOCKABLE_TYPES = [:String, :Number, :Numeric]
+
+    def id_for(object)
+      object.__id__
+    end
+
+    # originally had an alternate impl here due to Opal::RSpec::Compatibility.module_case_works_right?, now also doing checks
+    def proxy_not_found_for(id, object)
+      raise "#{object.class} #{object} cannot be used for mocking in Opal!" if OPAL_NON_MOCKABLE_TYPES.include?(object.class.name)
+      # case when SomeClass wasn't working properly
+      includes_test_double = [
+          InstanceVerifyingDouble,
+          ObjectVerifyingDouble,
+          ClassVerifyingDouble,
+          Double
+      ]
+      proxies[id] = if object.is_a?(NilClass)
+                      ProxyForNil.new(@expectation_ordering)
+                    elsif includes_test_double.any? { |klass| object.is_a? klass }
+                      object.__build_mock_proxy_unless_expired(@expectation_ordering)
+                    elsif object.is_a?(Class)
+                      if RSpec::Mocks.configuration.verify_partial_doubles?
+                        VerifyingPartialClassDoubleProxy.new(self, object, @expectation_ordering)
+                      else
+                        PartialClassDoubleProxy.new(self, object, @expectation_ordering)
+                      end
+                    else
+                      if RSpec::Mocks.configuration.verify_partial_doubles?
+                        VerifyingPartialDoubleProxy.new(object, @expectation_ordering)
+                      else
+                        PartialDoubleProxy.new(object, @expectation_ordering)
+                      end
+                    end
+    end
+  end
+end

data/{opal → lib-opal}/opal/rspec/fixes/rspec/support.rb

@@ -2,3 +2,4 @@ require_relative 'support/spec'
 require_relative 'support/encoded_string'
 require_relative 'support/recursive_const_methods'
 require_relative 'support/warnings'
+require_relative 'support/formatter_support'

data/lib-opal/opal/rspec/fixes/rspec/support/formatter_support.rb

@@ -0,0 +1,34 @@
+module FormatterSupport
+  def run_example_specs_with_formatter(formatter_option)
+    options = RSpec::Core::ConfigurationOptions.new(%W[spec/rspec/core/resources/formatter_specs.rb --format #{formatter_option} --order defined])
+
+    err, out = StringIO.new, StringIO.new
+    err.set_encoding("utf-8") if err.respond_to?(:set_encoding)
+
+    runner = RSpec::Core::Runner.new(options)
+    configuration = runner.instance_variable_get("@configuration")
+    configuration.backtrace_formatter.exclusion_patterns << /rspec_with_simplecov/
+    configuration.backtrace_formatter.inclusion_patterns = []
+
+    runner.run(err, out)
+
+    # WAS:
+    #   output = out.string
+    #   output.gsub!(/\d+(?:\.\d+)?(s| seconds)/, "n.nnnn\\1")
+    # NOW:
+    output = out.string.gsub(/\d+(?:\.\d+)?(s| seconds)/, "n.nnnn\\1")
+
+    caller_line = RSpec::Core::Metadata.relative_path(caller.first)
+    output.lines.reject do |line|
+      # remove the direct caller as that line is different for the summary output backtraces
+      line.include?(caller_line) ||
+
+      # ignore scirpt/rspec_with_simplecov because we don't usually have it locally but
+      # do have it on travis
+      line.include?("script/rspec_with_simplecov") ||
+
+      # this line varies a bit depending on how you run the specs (via `rake` vs `rspec`)
+      line.include?('/exe/rspec:')
+    end.join
+  end
+end

data/{opal → lib-opal}/opal/rspec/fixes/rspec/support/warnings.rb

@@ -10,8 +10,6 @@ module ::RSpec
         message += " Called from #{call_site}." if call_site
         ::Kernel.warn message
       end
-
-      alias_method :support_warn_with, :warn_with
     end
   end
   extend RSpec::Support::Warnings

data/{opal → lib-opal}/opal/rspec/formatter/noop_flush_string_io.rb

@@ -1,3 +1,5 @@
+require 'stringio'
+
 module Opal
   module RSpec
     class NoopFlushStringIO < StringIO

data/{opal → lib-opal}/opal/rspec/pre_require_fixes.rb

@@ -3,4 +3,4 @@ RUBY_DESCRIPTION = RUBY_VERSION unless defined?(RUBY_DESCRIPTION)
 
 class SecurityError < Exception; end unless defined?(SecurityError)
 
-require_relative 'fixes/opal/compatibility'
+require_relative 'fixes/opal'

data/{opal → lib-opal}/opal/rspec/requires.rb

@@ -1,4 +1,5 @@
-# Generated automatically by util/normalize_requires.rb, triggered by Rake task :generate_requires, do not edit
+# Generated automatically by bin/generate_requires
+require 'cgi/escape'
 require 'cgi/util'
 require 'diff/lcs'
 require 'diff/lcs/block'
@@ -139,7 +140,9 @@ require 'rspec/support/ruby_features'
 require 'rspec/support/version'
 require 'rspec/support/warnings'
 require 'rspec/version'
+require 'rubygems/bundler_version_finder'
+require 'rubygems/util'
 require 'set'
 require 'shellwords'
 require 'stringio'
-require 'strscan'
+require 'strscan'

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

@@ -0,0 +1 @@
+<%= ::Opal::RSpec.spec_opts_code ENV['SPEC_OPTS'] %>

data/lib/opal/rspec.rb

@@ -1,40 +1,49 @@
 require 'opal'
-require 'opal/sprockets'
+require 'opal-sprockets'
 require 'opal/rspec/version'
 require 'opal/rspec/sprockets_environment'
+require 'opal/rspec/runner'
 
 # Just register our opal code path with opal build tools
-Opal.append_path File.expand_path('../../../opal', __FILE__)
+Opal.append_path File.expand_path('../../../lib-opal', __FILE__)
+Opal.append_path File.expand_path('../../../stubs', __FILE__)
 
 # Catch our git submodule included directories
-%w{rspec rspec-core rspec-expectations rspec-mocks rspec-support}.each do |gem|
-  Opal.append_path File.expand_path("../../../#{gem}/lib", __FILE__)
+%w{rspec rspec-core rspec-expectations rspec-mocks rspec-support}.each do |gem_name|
+  Opal.append_path File.expand_path("../../../#{gem_name}/upstream/lib", __FILE__)
 end
 
 # Since we have better specs than before (and a script to deal with this), ignoring
 Opal::Config.dynamic_require_severity = :ignore
 
-stubs = [
-  'mutex_m', # Used with some threading operations but seems to run OK without this
-  'prettyprint',
-  'tempfile', # Doesn't exist in Opal
-  'diff/lcs',
-  'diff/lcs/block',
-  'diff/lcs/callbacks',
-  'diff/lcs/change',
-  'diff/lcs/hunk',
-  'diff/lcs/internals',
-  'test/unit/assertions',
-  # Opal doesn't have optparse, yet
-  'optparse',
-  'shellwords',
-  'socket',
-  'uri',
-  'drb/drb',
-  'cgi/util',
-  'minitest', # RSpec uses require to see if minitest is there, opal/sprockets won't like that, so stub it
-  'minitest/unit',
-  'minitest/assertions'
-]
-
-::Opal::Config.stubbed_files.merge(stubs)
+module Opal
+  module RSpec
+    def self.spec_opts_code(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('; ')
+    end
+  end
+end