opal-rspec 0.8.0 → 1.0.0

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

@@ -1,6 +1,9 @@
-require 'opal/rspec/async/core_ext'
+require 'await'
+
 require 'opal/rspec/async/example'
 require 'opal/rspec/async/example_group'
+require 'opal/rspec/async/memoized_helpers'
 require 'opal/rspec/async/hooks'
 require 'opal/rspec/async/reporter'
 require 'opal/rspec/async/runner'
+require 'opal/rspec/async/configuration'

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

@@ -3,11 +3,3 @@ 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.exit }
-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/browser_early.rb

@@ -0,0 +1,5 @@
+unless File.respond_to? :read
+  def File.read(*)
+    raise Errno::ENOENT
+  end
+end

data/lib-opal/opal/rspec/fixes/diff-lcs/hunk.rb

@@ -0,0 +1,164 @@
+require 'diff/lcs/hunk'
+
+class Diff::LCS::Hunk
+
+  def unified_diff(last = false)
+    # Calculate item number range.
+    s = encode("@@ -#{unified_range(:old, last)} +#{unified_range(:new, last)} @@\n")
+
+    # Outlist starts containing the hunk of the old file. Removing an item
+    # just means putting a '-' in front of it. Inserting an item requires
+    # getting it from the new file and splicing it in. We splice in
+    # +num_added+ items. Remove blocks use +num_added+ because splicing
+    # changed the length of outlist.
+    #
+    # We remove +num_removed+ items. Insert blocks use +num_removed+
+    # because their item numbers -- corresponding to positions in the NEW
+    # file -- don't take removed items into account.
+    lo, hi, num_added, num_removed = @start_old, @end_old, 0, 0
+
+    # standard:disable Performance/UnfreezeString
+    outlist = @data_old[lo..hi].map { |e| String.new("#{encode(" ")}#{e.chomp}") }
+    # standard:enable Performance/UnfreezeString
+
+    last_block = blocks[-1]
+
+    if last
+      old_missing_newline = missing_last_newline?(@data_old)
+      new_missing_newline = missing_last_newline?(@data_new)
+    end
+
+    @blocks.each do |block|
+      block.remove.each do |item|
+        op = item.action.to_s # -
+        offset = item.position - lo + num_added
+        # fixed for Opal:
+        outlist[offset] = encode(op) + outlist[offset][1..-1]
+        num_removed += 1
+      end
+
+      if last && block == last_block && old_missing_newline && !new_missing_newline
+        outlist << encode('\')
+        num_removed += 1
+      end
+
+      block.insert.each do |item|
+        op = item.action.to_s # +
+        offset = item.position - @start_new + num_removed
+        outlist[offset, 0] = encode(op) + @data_new[item.position].chomp
+        num_added += 1
+      end
+    end
+
+    outlist << encode('\') if last && new_missing_newline
+
+    s += outlist.join(encode("\n"))
+
+    s
+  end
+
+  def context_diff(last = false)
+    s = encode("***************\n")
+    s += encode("*** #{context_range(:old, ",", last)} ****\n")
+    r = context_range(:new, ",", last)
+
+    if last
+      old_missing_newline = missing_last_newline?(@data_old)
+      new_missing_newline = missing_last_newline?(@data_new)
+    end
+
+    # Print out file 1 part for each block in context diff format if there
+    # are any blocks that remove items
+    lo, hi = @start_old, @end_old
+    removes = @blocks.reject { |e| e.remove.empty? }
+
+    unless removes.empty?
+      # standard:disable Performance/UnfreezeString
+      outlist = @data_old[lo..hi].map { |e| String.new("#{encode("  ")}#{e.chomp}") }
+      # standard:enable Performance/UnfreezeString
+
+      last_block = removes[-1]
+
+      removes.each do |block|
+        block.remove.each do |item|
+          outlist[item.position - lo] = encode(block.op) + outlist[item.position - lo][1..-1] # - or !
+        end
+
+        if last && block == last_block && old_missing_newline
+          outlist << encode('\')
+        end
+      end
+
+      s += outlist.join(encode("\n")) + encode("\n")
+    end
+
+    s += encode("--- #{r} ----\n")
+    lo, hi = @start_new, @end_new
+    inserts = @blocks.reject { |e| e.insert.empty? }
+
+    unless inserts.empty?
+      # standard:disable Performance/UnfreezeString
+      outlist = @data_new[lo..hi].map { |e| String.new("#{encode("  ")}#{e.chomp}") }
+      # standard:enable Performance/UnfreezeString
+
+      last_block = inserts[-1]
+
+      inserts.each do |block|
+        block.insert.each do |item|
+          outlist[item.position - lo] = encode(block.op) + outlist[item.position - lo][1..-1] # + or !
+        end
+
+        if last && block == last_block && new_missing_newline
+          outlist << encode('\')
+        end
+      end
+      s += outlist.join(encode("\n"))
+    end
+
+    s
+  end
+
+  def old_diff(_last = false)
+    warn "Expecting only one block in an old diff hunk!" if @blocks.size > 1
+
+    block = @blocks[0]
+
+    # Calculate item number range. Old diff range is just like a context
+    # diff range, except the ranges are on one line with the action between
+    # them.
+    s = encode("#{context_range(:old, ",")}#{OLD_DIFF_OP_ACTION[block.op]}#{context_range(:new, ",")}\n")
+    # If removing anything, just print out all the remove lines in the hunk
+    # which is just all the remove lines in the block.
+    unless block.remove.empty?
+      @data_old[@start_old..@end_old].each { |e| s += encode("< ") + e.chomp + encode("\n") }
+    end
+
+    s += encode("---\n") if block.op == "!"
+
+    unless block.insert.empty?
+      @data_new[@start_new..@end_new].each { |e| s += encode("> ") + e.chomp + encode("\n") }
+    end
+
+    s
+  end
+
+
+  def ed_diff(format, _last = false)
+    warn "Expecting only one block in an old diff hunk!" if @blocks.size > 1
+
+    s =
+      if format == :reverse_ed
+        encode("#{ED_DIFF_OP_ACTION[@blocks[0].op]}#{context_range(:old, ",")}\n")
+      else
+        encode("#{context_range(:old, " ")}#{ED_DIFF_OP_ACTION[@blocks[0].op]}\n")
+      end
+
+    unless @blocks[0].insert.empty?
+      @data_new[@start_new..@end_new].each do |e|
+        s += e.chomp + encode("\n")
+      end
+      s += encode(".\n")
+    end
+    s
+  end
+end

data/lib-opal/opal/rspec/fixes/diff-lcs/lcs.rb

@@ -0,0 +1,112 @@
+require 'diff/lcs'
+
+class << Diff::LCS
+  # mutable strings
+  def patch(src, patchset, direction = nil)
+    # Normalize the patchset.
+    has_changes, patchset = Diff::LCS::Internals.analyze_patchset(patchset)
+
+    return src.respond_to?(:dup) ? src.dup : src unless has_changes
+
+    string = src.is_a?(String)
+    # Start with a new empty type of the source's class
+    res = src.class.new
+
+    res = [] if string
+
+    direction ||= Diff::LCS::Internals.intuit_diff_direction(src, patchset)
+
+    ai = bj = 0
+
+    patch_map = PATCH_MAP[direction]
+
+    patchset.each do |change|
+      # Both Change and ContextChange support #action
+      action = patch_map[change.action]
+
+      case change
+      when Diff::LCS::ContextChange
+        case direction
+        when :patch
+          el = change.new_element
+          op = change.old_position
+          np = change.new_position
+        when :unpatch
+          el = change.old_element
+          op = change.new_position
+          np = change.old_position
+        end
+
+        case action
+        when "-" # Remove details from the old string
+          while ai < op
+            res << (string ? src[ai, 1] : src[ai])
+            ai += 1
+            bj += 1
+          end
+          ai += 1
+        when "+"
+          while bj < np
+            res << (string ? src[ai, 1] : src[ai])
+            ai += 1
+            bj += 1
+          end
+
+          res << el
+          bj += 1
+        when "="
+          # This only appears in sdiff output with the SDiff callback.
+          # Therefore, we only need to worry about dealing with a single
+          # element.
+          res << el
+
+          ai += 1
+          bj += 1
+        when "!"
+          while ai < op
+            res << (string ? src[ai, 1] : src[ai])
+            ai += 1
+            bj += 1
+          end
+
+          bj += 1
+          ai += 1
+
+          res << el
+        end
+      when Diff::LCS::Change
+        case action
+        when "-"
+          while ai < change.position
+            res << (string ? src[ai, 1] : src[ai])
+            ai += 1
+            bj += 1
+          end
+          ai += 1
+        when "+"
+          while bj < change.position
+            res << (string ? src[ai, 1] : src[ai])
+            ai += 1
+            bj += 1
+          end
+
+          bj += 1
+
+          res << change.element
+        end
+      end
+    end
+
+    while ai < src.size
+      res << (string ? src[ai, 1] : src[ai])
+      ai += 1
+      bj += 1
+    end
+
+    if string
+      res.join
+    else
+      res
+    end
+  end
+end

data/lib-opal/opal/rspec/fixes/diff-lcs.rb

@@ -0,0 +1,2 @@
+require_relative 'diff-lcs/lcs'
+require_relative 'diff-lcs/hunk'

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

@@ -1,4 +1,8 @@
 require 'opal/platform'
+require 'opal-parser'
+require 'thread'
+require 'corelib/marshal'
+require 'ruby2_keywords'
 
 class IO
   def closed?
@@ -9,31 +13,14 @@ 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

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

@@ -0,0 +1,11 @@
+module RSpec
+  module Core
+    # Persists example ids and their statuses so that we can filter
+    # to just the ones that failed the last time they ran.
+    # @private
+    class ExampleStatusPersister
+      def persist
+      end
+    end
+  end
+end

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

@@ -1,19 +1,10 @@
 class RSpec::Core::Formatters::DeprecationFormatter
-
-  # SpecifiedDeprecationMessage is a Struct
-  SpecifiedDeprecationMessage.class_eval do
-    def too_many_warnings_message
-      # mutable strings not supported
-      "Too many similar deprecation messages reported, disregarding further reports. " + DEPRECATION_STREAM_NOTICE
-    end
-  end
-
   # GeneratedDeprecationMessage is a Struct
   GeneratedDeprecationMessage.class_eval do
     def to_s
-      msg = "#{@data.deprecated} is deprecated."
-      msg = msg + " Use #{@data.replacement} instead." if @data.replacement
-      msg = msg + " Called from #{@data.call_site}." if @data.call_site
+      msg = String.new("#{@data.deprecated} is deprecated.")
+      msg += " Use #{@data.replacement} instead." if @data.replacement
+      msg += " Called from #{@data.call_site}."   if @data.call_site
       msg
     end
   end

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

@@ -0,0 +1,28 @@
+module RSpec
+  module Core
+    module Formatters
+      class ExceptionPresenter
+        def indent_lines(lines, failure_number)
+          alignment_basis = ' ' * @indentation
+          alignment_basis +=  "#{failure_number}) " if failure_number
+          indentation = ' ' * alignment_basis.length
+
+          lines.each_with_index.map do |line, index|
+            if index == 0
+              "#{alignment_basis}#{line}"
+            elsif line.empty?
+              line
+            else
+              "#{indentation}#{line}"
+            end
+          end
+        end
+
+        def fully_formatted(failure_number, colorizer=::RSpec::Core::Formatters::ConsoleCodes)
+          lines = fully_formatted_lines(failure_number, colorizer)
+          lines.join("\n") + "\n"
+        end
+      end
+    end
+  end
+end

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

@@ -1,10 +1,4 @@
 class ::RSpec::Core::Formatters::Loader
-  def string_const?(str)
-    # Incompatible regex (\A flag and \z flag)
-    # str.is_a?(String) && /\A[A-Z][a-zA-Z0-9_:]*\z/ =~ str
-    str.is_a?(String) && /^[A-Z][a-zA-Z0-9_:]*$/ =~ str
-  end
-
   def underscore(camel_cased_word)
     # string mutation
     word = camel_cased_word.to_s.dup
@@ -14,31 +8,5 @@ class ::RSpec::Core::Formatters::Loader
     word = word.tr("-", "_")
     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
-    elsif string_const?(formatter_ref)
-      # retry not supported on opal
-      # begin
-      #   formatter_ref.gsub(/^::/, '').split('::').inject(Object) { |a, e| a.const_get e }
-      # rescue NameError
-      #   require(path_for(formatter_ref)) ? retry : raise
-      # end
-      while true
-        begin
-          return formatter_ref.gsub(/^::/, '').split('::').inject(Object) { |a, e| a.const_get e }
-        rescue NameError
-          raise unless require(path_for(formatter_ref))
-        end
-      end
-    end
-  end
 end
 

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

@@ -0,0 +1,17 @@
+module RSpec
+  module Core
+    module Formatters
+      # @private
+      class SnippetExtractor
+        def self.source_from_file(path)
+          # Don't check for file existence, we may still have its embedded source
+          # raise NoSuchFileError unless File.exist?(path)
+          RSpec.world.source_from_file(path)
+        rescue Errno::ENOENT, Errno::ENAMETOOLONG
+          # But if we really don't, well...
+          raise NoSuchFileError
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+require 'opal-replutils'
+
+module RSpec
+  module Core
+    module Formatters
+      # @private
+      # Provides terminal syntax highlighting of code snippets
+      # when coderay is available.
+      class SyntaxHighlighter
+        # A poor-man highlighter
+        def highlight(lines)
+          REPLUtils::ColorPrinter.colorize(lines.join("\n")).split("\n")
+        end
+      end
+    end
+  end
+end

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

@@ -1,6 +1,5 @@
-require_relative 'formatters/backtrace_formatter'
 require_relative 'formatters/deprecation_formatter'
-require_relative 'formatters/generated_deprecation_message'
-require_relative 'formatters/console_codes'
 require_relative 'formatters/loader'
-require_relative 'formatters/json_formatter'
+require_relative 'formatters/exception_presenter'
+require_relative 'formatters/syntax_highlighter'
+require_relative 'formatters/snippet_extractor'

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

@@ -2,19 +2,35 @@ module ::RSpec::Core::Metadata
   class HashPopulator
     def populate_location_attributes
       backtrace = user_metadata.delete(:caller)
-      # Throwing exceptions to get code location is expensive, so use this if the user supplied it, otherwise
-      # keep empty stuff around so filter code does not crash
 
-      # might have an empty array from caller which file_path_and_line_number_from doesn't like
-      file_path, line_number = if backtrace && !backtrace.empty?
+      file_path, line_number = if backtrace
                                  file_path_and_line_number_from(backtrace)
+                               elsif block.respond_to?(:source_location)
+                                 block.source_location
                                else
-                                 ['', -1]
+                                 file_path_and_line_number_from(caller)
                                end
 
-      metadata[:file_path]   = file_path
-      metadata[:line_number] = line_number.to_i
-      metadata[:location]    = file_path.empty? ? '' : "#{file_path}:#{line_number}"
+      file_path ||= ""
+
+      relative_file_path            = ::RSpec::Core::Metadata.relative_path(file_path)
+      absolute_file_path            = File.expand_path(relative_file_path)
+      metadata[:file_path]          = relative_file_path
+      metadata[:line_number]        = line_number.to_i
+      metadata[:location]           = "#{relative_file_path}:#{line_number}"
+      metadata[:absolute_file_path] = absolute_file_path
+      metadata[:rerun_file_path]  ||= relative_file_path
+      metadata[:scoped_id]          = build_scoped_id_for(absolute_file_path)
+    end
+
+    def build_description_from(parent_description=nil, my_description=nil)
+      return parent_description.to_s unless my_description
+      return my_description.to_s if parent_description.to_s == ''
+      separator = description_separator(parent_description, my_description)
+      # WAS:
+      # (parent_description.to_s + separator) << my_description.to_s
+      # NOW:
+      (parent_description.to_s + separator) + my_description.to_s
     end
   end
 end

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

@@ -1,27 +1,10 @@
 module ::RSpec::Core::Notifications
   class ExamplesNotification
-    def fully_formatted_failed_examples(colorizer=::RSpec::Core::Formatters::ConsoleCodes)
-      formatted = "\nFailures:\n"
-
-      failure_notifications.each_with_index do |failure, index|
-        # string mutation
-        formatted = formatted + failure.fully_formatted(index.next, colorizer)
-      end
-
-      formatted
-    end
-    
     def fully_formatted_pending_examples(colorizer=::RSpec::Core::Formatters::ConsoleCodes)
-      formatted = "\nPending:\n"
-
-      pending_examples.each do |example|
-        formatted_caller = RSpec.configuration.backtrace_formatter.backtrace_line(example.location)
+      formatted = "\nPending: (Failures listed here are expected and do not affect your suite's status)\n".dup
 
-        # string mutation
-        formatted = formatted +
-          "  #{colorizer.wrap(example.full_description, :pending)}\n" \
-          "    # #{colorizer.wrap(example.execution_result.pending_message, :detail)}\n" \
-          "    # #{colorizer.wrap(formatted_caller, :detail)}\n"
+      pending_notifications.each_with_index do |notification, index|
+        formatted += notification.fully_formatted(index.next, colorizer)
       end
 
       formatted

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

@@ -1,3 +1 @@
 require_relative 'notifications/examples_notification'
-require_relative 'notifications/failed_example_notification'
-require_relative 'notifications/summary_notification'

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

@@ -1,7 +1,6 @@
-require_relative 'core/example'
 require_relative 'core/formatters'
 require_relative 'core/notifications'
 require_relative 'core/ordering'
 require_relative 'core/metadata'
 require_relative 'core/configuration'
-require_relative 'core/warnings'
+require_relative 'core/example_status_persister'

data/lib-opal/opal/rspec/fixes/rspec/expectations.rb

@@ -1 +0,0 @@
-require_relative 'expectations/fail_with'

data/lib-opal/opal/rspec/fixes/rspec/matchers/built_in/base_matcher.rb

@@ -0,0 +1,26 @@
+require 'rspec/matchers/built_in/base_matcher'
+
+module RSpec
+  module Matchers
+    module BuiltIn
+      class BaseMatcher
+        # activesupport/lib/active_support/inflector/methods.rb, line 48
+        # mutable strings fixed for opal
+        def self.underscore(camel_cased_word)
+          word = camel_cased_word.to_s.dup
+          word = word.gsub(/::/, '/')
+          word = word.gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
+          word = word.gsub(/([a-z\d])([A-Z])/, '\1_\2')
+          word = word.tr("-", "_")
+          word.downcase
+        end
+
+        def description
+          desc = EnglishPhrasing.split_words(self.class.matcher_name)
+          desc += EnglishPhrasing.list(@expected) if defined?(@expected)
+          desc
+        end
+      end
+    end
+  end
+end

data/lib-opal/opal/rspec/fixes/rspec/matchers/built_in.rb

@@ -1,4 +1,2 @@
-require_relative 'built_in/yield'
+require_relative 'built_in/base_matcher'
 require_relative 'built_in/start_and_end_with'
-require_relative 'built_in/compound'
-require_relative 'built_in/all'

data/lib-opal/opal/rspec/fixes/rspec/matchers/expecteds_for_multiple_diffs.rb

@@ -0,0 +1,13 @@
+module RSpec
+  module Matchers
+    # @api private
+    # Handles list of expected values when there is a need to render
+    # multiple diffs. Also can handle one value.
+    class ExpectedsForMultipleDiffs
+      def self.truncated(description)
+        return description if description.length <= DESCRIPTION_MAX_LENGTH
+        description[0...DESCRIPTION_MAX_LENGTH - 3] + "..."
+      end
+    end
+  end
+end

data/lib-opal/opal/rspec/fixes/rspec/matchers.rb

@@ -1,2 +1,2 @@
-require_relative 'matchers/pretty'
 require_relative 'matchers/built_in'
+require_relative 'matchers/expecteds_for_multiple_diffs'