opal-rspec 0.4.3 → 0.5.0.beta1

data/opal/opal/rspec/fixes.rb

@@ -1,116 +1,12 @@
 require 'encoding'
-
-# This breaks on 2.0.0, so it is here ready for when opal bumps to 2.0.0
-class RSpec::CallerFilter
-  def self.first_non_rspec_line
-    ""
-  end
-end
-
-# Opal does not support mutable strings
-module RSpec
-  module Matchers
-    module Pretty
-      def underscore(camel_cased_word)
-        word = camel_cased_word.to_s
-        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 = word.downcase
-        word
-      end
-    end
-  end
-end
-
-module RSpec::ExampleGroups
-  # opal cannot use mutable strings AND opal doesnt support `\A` or `\z` anchors
-  def self.base_name_for(group)
-    return "Anonymous" if group.description.empty?
-
-    # convert to CamelCase
-    name = ' ' + group.description
-    name = name.gsub(/[^0-9a-zA-Z]+([0-9a-zA-Z])/) { |m| m[1].upcase }
-
-    name = name.lstrip         # Remove leading whitespace
-    name = name.gsub(/\W/, '') # JRuby, RBX and others don't like non-ascii in const names
-
-    # Ruby requires first const letter to be A-Z. Use `Nested`
-    # as necessary to enforce that.
-    name = name.gsub(/^([^A-Z]|$)/, 'Nested\1')
-
-    name
-  end
-
-  # opal cannot use mutable strings
-  def self.disambiguate(name, const_scope)
-    return name unless const_scope.const_defined?(name)
-
-    # Add a trailing number if needed to disambiguate from an existing constant.
-    name = name + "_2"
-    while const_scope.const_defined?(name)
-      name = name.next
-    end
-
-    name
-  end
-end
-
-# Opal does not support ObjectSpace, so force object __id__'s
-class RSpec::Mocks::Space
-  def id_for(object)
-    object.__id__
-  end
-end
-
-# Buggy under Opal?
-class RSpec::Mocks::MethodDouble
-  def save_original_method!
-    @original_method ||= @method_stasher.original_method
-  end
-end
-
-# Missing on vendored rspec version
-module RSpec
-  module Core
-    module MemoizedHelpers
-      def is_expected
-        expect(subject)
-      end
-    end
-  end
-end
-
-RSpec::Core::Formatters::DeprecationFormatter::GeneratedDeprecationMessage.class_eval do
-  def to_s
-    msg =  "#{@data[:deprecated]} is deprecated."
-    msg += " Use #{@data[:replacement]} instead." if @data[:replacement]
-    msg += " Called from #{@data[:call_site]}." if @data[:call_site]
-    msg
-  end
-
-  def too_many_warnings_message
-    msg = "Too many uses of deprecated '#{type}'."
-    msg += " Set config.deprecation_stream to a File for full output."
-    msg
-  end
-end
-
-def (RSpec::Expectations).fail_with(message, expected=nil, actual=nil)
-  if !message
-    raise ArgumentError, "Failure message is nil. Does your matcher define the " +
-                         "appropriate failure_message_for_* method to return a string?"
-  end
-
-  if actual && expected
-    if all_strings?(actual, expected)
-      if any_multiline_strings?(actual, expected)
-        message # + "\nDiff:" + differ.diff_as_string(coerce_to_string(actual), coerce_to_string(expected))
-      end
-    elsif no_procs?(actual, expected) && no_numbers?(actual, expected)
-      message # + "\nDiff:" + differ.diff_as_object(actual, expected)
-    end
-  end
-
-  raise(RSpec::Expectations::ExpectationNotMetError.new(message))
-end
+# Thread usage in core.rb
+require 'thread'
+require 'opal/rspec/fixes/caller_filter'
+require 'opal/rspec/fixes/matchers'
+require 'opal/rspec/fixes/example_groups'
+require 'opal/rspec/fixes/mocks'
+require 'opal/rspec/fixes/kernel'
+require 'opal/rspec/fixes/reporter'
+require 'opal/rspec/fixes/formatter'
+require 'opal/rspec/fixes/example'
+require 'opal/rspec/fixes/expectations'

data/opal/opal/rspec/pre_require_fixes.rb

@@ -0,0 +1,4 @@
+# best guess for now, this is not defined by Opal, needed for instance_method_stasher.rb
+RUBY_DESCRIPTION = RUBY_VERSION unless defined?(RUBY_DESCRIPTION)
+
+class SecurityError < Exception; end unless defined?(SecurityError)

data/opal/opal/rspec/requires.rb

@@ -1,45 +1,113 @@
-require 'corelib/dir'
-require 'thread'
-
-require 'set'
-require 'time'
-require 'rbconfig'
+# Generated automatically by util/normalize_requires.rb, triggered by Rake task :generate_requires, do not edit
+require 'cgi/util'
+require 'diff/lcs'
+require 'diff/lcs/block'
+require 'diff/lcs/callbacks'
+require 'diff/lcs/change'
+require 'diff/lcs/hunk'
+require 'diff/lcs/internals'
+require 'erb'
+require 'optparse'
 require 'pathname'
-
-# TODO: still needed? meh..
-require 'rspec/core/version'
-require 'rspec/core/flat_map'
-require 'rspec/core/filter_manager'
+require 'pp'
+require 'prettyprint'
+require 'rbconfig'
+require 'rspec'
+require 'rspec/core'
+require 'rspec/core/backport_random'
+require 'rspec/core/backtrace_formatter'
+require 'rspec/core/configuration'
+require 'rspec/core/configuration_options'
 require 'rspec/core/dsl'
-require 'rspec/core/reporter'
+require 'rspec/core/example'
+require 'rspec/core/example_group'
+require 'rspec/core/filter_manager'
+require 'rspec/core/flat_map'
+require 'rspec/core/formatters'
+require 'rspec/core/formatters/base_formatter'
+require 'rspec/core/formatters/deprecation_formatter'
+require 'rspec/core/formatters/helpers'
+require 'rspec/core/formatters/html_printer'
 require 'rspec/core/hooks'
 require 'rspec/core/memoized_helpers'
 require 'rspec/core/metadata'
-require 'rspec/core/pending'
-require 'rspec/core/formatters'
-require 'rspec/core/ordering'
-require 'rspec/core/world'
-require 'rspec/core/configuration'
+require 'rspec/core/metadata_filter'
+require 'rspec/core/mocking_adapters/rspec'
+require 'rspec/core/notifications'
 require 'rspec/core/option_parser'
-require 'rspec/core/configuration_options'
-require 'rspec/core/command_line'
+require 'rspec/core/ordering'
+require 'rspec/core/pending'
+require 'rspec/core/reporter'
+require 'rspec/core/ruby_project'
 require 'rspec/core/runner'
-require 'rspec/core/example'
-require 'rspec/core/shared_example_group/collection'
 require 'rspec/core/shared_example_group'
-require 'rspec/core/example_group'
-
-require 'rspec/core/mocking/with_rspec'
-
-require 'rspec/support'
-require 'rspec/core'
+require 'rspec/core/version'
+require 'rspec/core/warnings'
+require 'rspec/core/world'
 require 'rspec/expectations'
-require 'rspec/mocks'
-require 'rspec'
-
-# FIXME: still needed?
-require 'rspec/core/formatters/base_text_formatter'
-require 'rspec/core/formatters/html_printer'
-require 'rspec/matchers/pretty'
+require 'rspec/expectations/configuration'
+require 'rspec/expectations/expectation_target'
+require 'rspec/expectations/fail_with'
+require 'rspec/expectations/handler'
+require 'rspec/expectations/syntax'
+require 'rspec/expectations/version'
+require 'rspec/matchers'
+require 'rspec/matchers/aliased_matcher'
+require 'rspec/matchers/built_in'
 require 'rspec/matchers/built_in/base_matcher'
-require 'rspec/matchers/built_in/be'
+require 'rspec/matchers/composable'
+require 'rspec/matchers/dsl'
+require 'rspec/matchers/generated_descriptions'
+require 'rspec/matchers/matcher_delegator'
+require 'rspec/matchers/pretty'
+require 'rspec/mocks'
+require 'rspec/mocks/any_instance'
+require 'rspec/mocks/any_instance/chain'
+require 'rspec/mocks/any_instance/expect_chain_chain'
+require 'rspec/mocks/any_instance/expectation_chain'
+require 'rspec/mocks/any_instance/message_chains'
+require 'rspec/mocks/any_instance/proxy'
+require 'rspec/mocks/any_instance/recorder'
+require 'rspec/mocks/any_instance/stub_chain'
+require 'rspec/mocks/any_instance/stub_chain_chain'
+require 'rspec/mocks/argument_list_matcher'
+require 'rspec/mocks/argument_matchers'
+require 'rspec/mocks/configuration'
+require 'rspec/mocks/error_generator'
+require 'rspec/mocks/example_methods'
+require 'rspec/mocks/instance_method_stasher'
+require 'rspec/mocks/matchers/expectation_customization'
+require 'rspec/mocks/message_expectation'
+require 'rspec/mocks/method_double'
+require 'rspec/mocks/method_reference'
+require 'rspec/mocks/mutate_const'
+require 'rspec/mocks/object_reference'
+require 'rspec/mocks/order_group'
+require 'rspec/mocks/proxy'
+require 'rspec/mocks/space'
+require 'rspec/mocks/syntax'
+require 'rspec/mocks/targets'
+require 'rspec/mocks/test_double'
+require 'rspec/mocks/verifying_double'
+require 'rspec/mocks/verifying_message_expecation'
+require 'rspec/mocks/verifying_proxy'
+require 'rspec/mocks/version'
+require 'rspec/support'
+require 'rspec/support/caller_filter'
+require 'rspec/support/differ'
+require 'rspec/support/directory_maker'
+require 'rspec/support/encoded_string'
+require 'rspec/support/fuzzy_matcher'
+require 'rspec/support/hunk_generator'
+require 'rspec/support/matcher_definition'
+require 'rspec/support/method_signature_verifier'
+require 'rspec/support/os'
+require 'rspec/support/recursive_const_methods'
+require 'rspec/support/ruby_features'
+require 'rspec/support/version'
+require 'rspec/support/warnings'
+require 'rspec/version'
+require 'set'
+require 'shellwords'
+require 'stringio'
+require 'strscan'

data/opal/opal/rspec/runner.rb

@@ -19,12 +19,8 @@ module Opal
           end
         end
 
-        def autorun
-          if browser?
-            `setTimeout(function() { #{Runner.new.run} }, 0)`
-          else # phantom
-            Runner.new.run
-          end
+        def autorun          
+            Runner.new.run          
         end
       end
 
@@ -39,29 +35,37 @@ module Opal
         @configuration.output_stream ||= out
 
         self.start
-        run_examples
-
-        run_async_examples do
+        run_examples.then do          
           self.finish
-        end
+        end        
       end
 
       def run_examples
-        @world.example_groups.map { |g| g.run(@reporter) }.all?
+        @world.example_groups.inject(Promise.value) do |previous_promise, group|
+          previous_promise.then do
+            group.run @reporter
+          end
+        end        
+      end    
+
+      def config_hook(hook_when)
+        hook_context = ::RSpec::Core::SuiteHookContext.new
+        @configuration.hooks.run(hook_when, :suite, hook_context)
       end
 
-      def run_async_examples(&block)
-        AsyncRunner.new(self, @reporter, block).run
+      def config_hook(hook_when)
+        hook_context = ::RSpec::Core::SuiteHookContext.new
+        @configuration.hooks.run(hook_when, :suite, hook_context)
       end
 
       def start
         @reporter = @configuration.reporter
         @reporter.start(@world.example_count)
-        @configuration.run_hook(:before, :suite)
+        config_hook :before
       end
 
       def finish
-        @configuration.run_hook(:after, :suite)
+        config_hook :after
         @reporter.finish
       end
     end

data/opal/opal/rspec/text_formatter.rb

@@ -2,7 +2,10 @@ module Opal
   module RSpec
     class TextFormatter < ::RSpec::Core::Formatters::BaseFormatter
 
-      def dump_failures
+      ::RSpec::Core::Formatters.register self, :dump_summary, :dump_failures, :message
+
+      def dump_failures(notification)
+        failed_examples = notification.failed_examples
         if failed_examples.empty?
           puts "\nFinished"
         else
@@ -13,6 +16,10 @@ module Opal
           end
         end
       end
+      
+      def message(notification)
+        puts notification.message
+      end
 
       def dump_failure(example, index)
         puts "#{short_padding}#{index.next}) #{example.full_description}"
@@ -20,23 +27,26 @@ module Opal
       end
 
       def dump_failure_info(example)
-        exception = example.execution_result[:exception]
+        exception = example.execution_result.exception
         exception_class_name = exception.class.name.to_s
         red "#{long_padding}#{exception_class_name}:"
         exception.message.to_s.split("\n").each { |line| red "#{long_padding}  #{line}" }
       end
 
-      def dump_summary(duration, example_count, failure_count, pending_count)
-        @duration = duration
-        @example_count = example_count
-        @failure_count = failure_count
-        @pending_count = pending_count
+      def dump_summary(notification)
+        @duration = notification.duration
+        @example_count = notification.example_count
+        @failure_count = notification.failure_count
+        @pending_count = notification.pending_count
 
-        msg = "\n#{example_count} examples, #{failure_count} failures (time taken: #{duration})"
+        msg = "\n#{@example_count} examples, #{@failure_count} failures, #{@pending_count} pending (time taken: #{@duration})"
 
-        if failure_count == 0
+        if @pending_count > 0
+          yellow msg
+          finish_with_code(1)
+        elsif @failure_count == 0
           green msg
-          finish_with_code(0)
+          finish_with_code(0)          
         else
           red msg
           finish_with_code(1)
@@ -61,6 +71,10 @@ module Opal
       def red(str)
         `console.log('\033[31m' + str + '\033[0m')`
       end
+      
+      def yellow(str)
+        `console.log('\033[33m' + str + '\033[0m')`
+      end
 
       def short_padding
         '  '

data/opal/opal/rspec.rb

@@ -1,9 +1,4 @@
-class MiniTest
-  class Unit; end
-end
-
-Test = MiniTest
-
+require 'opal/rspec/pre_require_fixes'
 require 'opal/rspec/requires'
 require 'opal/rspec/fixes'
 require 'opal/rspec/text_formatter'
@@ -13,9 +8,9 @@ require 'opal/rspec/async'
 
 RSpec.configure do |config|
   # For now, always use our custom formatter for results
-  config.formatter = Opal::RSpec::Runner.default_formatter
-
-  # Async helpers for specs
+  config.default_formatter = Opal::RSpec::Runner.default_formatter
+  
+  # Legacy helpers
   config.include Opal::RSpec::AsyncHelpers
 
   # Always support expect() and .should syntax (we should not do this really..)

data/opal-rspec.gemspec

@@ -1,4 +1,5 @@
 # -*- encoding: utf-8 -*-
+require 'rake'
 require File.expand_path('../lib/opal/rspec/version', __FILE__)
 
 Gem::Specification.new do |s|
@@ -10,11 +11,13 @@ Gem::Specification.new do |s|
   s.summary      = 'RSpec for Opal'
   s.description  = 'Opal compatible rspec library'
 
-  s.files = `git ls-files`.split("\n")
+  s.files = `git ls-files`.split("\n") + FileList['rspec*/**/*.rb']
 
   s.require_paths  = ['lib']
 
-  s.add_dependency 'opal', ['>= 0.7.0', '< 0.9']
+  s.add_dependency 'opal', ['>= 0.8.0.rc1', '< 0.9']
+  # Opal now does not include minitest but we need it for Sprockets/test execution
+  s.add_dependency 'opal-minitest', '~> 0.0'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'yard'
 end

data/{vendor_lib → rspec/lib}/rspec/version.rb

@@ -1,5 +1,5 @@
 module RSpec # :nodoc:
   module Version # :nodoc:
-    STRING = '3.0.0.beta1'
+    STRING = '3.1.0'
   end
 end

data/rspec-core/benchmarks/call_v_yield.rb

@@ -0,0 +1,81 @@
+require 'benchmark'
+
+n = 100_000
+
+def call_block(&block)
+  block.call
+end
+
+def yield_control
+  yield
+end
+
+Benchmark.benchmark do |bm|
+  puts "#{n} times - ruby #{RUBY_VERSION}"
+
+  puts
+  puts "eval"
+
+  3.times do
+    bm.report do
+      n.times do
+        eval("2 + 3")
+      end
+    end
+  end
+
+  puts
+  puts "call block"
+
+  3.times do
+    bm.report do
+      n.times do
+        call_block { 2 + 3 }
+      end
+    end
+  end
+
+  puts
+  puts "yield"
+
+  3.times do
+    bm.report do
+      n.times do
+        yield_control { 2 + 3 }
+      end
+    end
+  end
+
+  puts
+  puts "exec"
+
+  3.times do
+    bm.report do
+      n.times do
+        2 + 3
+      end
+    end
+  end
+end
+
+# 100000 times - ruby 1.9.3
+#
+# eval
+#    0.870000   0.010000   0.880000 (  0.877762)
+#    0.890000   0.000000   0.890000 (  0.891142)
+#    0.890000   0.000000   0.890000 (  0.896365)
+#
+# call block
+#    0.120000   0.010000   0.130000 (  0.136322)
+#    0.130000   0.010000   0.140000 (  0.138608)
+#    0.130000   0.000000   0.130000 (  0.129931)
+#
+# yield
+#    0.020000   0.000000   0.020000 (  0.020412)
+#    0.010000   0.000000   0.010000 (  0.017926)
+#    0.020000   0.000000   0.020000 (  0.025740)
+#
+# exec
+#    0.010000   0.000000   0.010000 (  0.009935)
+#    0.010000   0.000000   0.010000 (  0.011588)
+#    0.010000   0.000000   0.010000 (  0.010613)

data/rspec-core/benchmarks/check_inclusion.rb

@@ -0,0 +1,125 @@
+require 'benchmark'
+
+n = 10_000
+
+num_modules = 1000
+
+class Foo; end
+modules = num_modules.times.map { Module.new }
+modules.each {|m| Foo.send(:include, m) }
+
+Benchmark.benchmark do |bm|
+  3.times do
+    bm.report do
+      n.times do
+        Foo < modules.first
+      end
+    end
+  end
+end
+
+Benchmark.benchmark do |bm|
+  3.times do
+    bm.report do
+      n.times do
+        Foo < modules.last
+      end
+    end
+  end
+end
+
+Benchmark.benchmark do |bm|
+  3.times do
+    bm.report do
+      n.times do
+        Foo.included_modules.include?(modules.first)
+      end
+    end
+  end
+end
+
+Benchmark.benchmark do |bm|
+  3.times do
+    bm.report do
+      n.times do
+        Foo.included_modules.include?(modules.last)
+      end
+    end
+  end
+end
+
+#### Ruby 1.9.3
+#
+# 100 modules
+# < modules.first
+  # 0.010000   0.000000   0.010000 (  0.005104)
+  # 0.000000   0.000000   0.000000 (  0.005114)
+  # 0.010000   0.000000   0.010000 (  0.005076)
+# < modules.last
+  # 0.000000   0.000000   0.000000 (  0.002180)
+  # 0.000000   0.000000   0.000000 (  0.002199)
+  # 0.000000   0.000000   0.000000 (  0.002189)
+# < included_modules.include?(modules.first)
+  # 0.110000   0.010000   0.120000 (  0.110062)
+  # 0.100000   0.000000   0.100000 (  0.105343)
+  # 0.100000   0.000000   0.100000 (  0.102770)
+# < included_modules.include?(modules.last)
+  # 0.050000   0.010000   0.060000 (  0.048520)
+  # 0.040000   0.000000   0.040000 (  0.049013)
+  # 0.050000   0.000000   0.050000 (  0.050668)
+
+# 1000 modules
+# < modules.first
+  # 0.080000   0.000000   0.080000 (  0.079460)
+  # 0.080000   0.000000   0.080000 (  0.078765)
+  # 0.080000   0.000000   0.080000 (  0.079560)
+# < modules.last
+  # 0.000000   0.000000   0.000000 (  0.002195)
+  # 0.000000   0.000000   0.000000 (  0.002201)
+  # 0.000000   0.000000   0.000000 (  0.002199)
+# < included_modules.include?(modules.first)
+  # 0.860000   0.010000   0.870000 (  0.887684)
+  # 0.870000   0.000000   0.870000 (  0.875158)
+  # 0.870000   0.000000   0.870000 (  0.879216)
+# < included_modules.include?(modules.last)
+  # 0.340000   0.000000   0.340000 (  0.344011)
+  # 0.350000   0.000000   0.350000 (  0.346277)
+  # 0.330000   0.000000   0.330000 (  0.335607)
+
+#### Ruby 1.8.7
+#
+# 100 modules
+# < modules.first
+  # 0.010000   0.000000   0.010000 (  0.007132)
+  # 0.010000   0.000000   0.010000 (  0.006869)
+  # 0.000000   0.000000   0.000000 (  0.005334)
+# < modules.last
+  # 0.010000   0.000000   0.010000 (  0.003438)
+  # 0.000000   0.000000   0.000000 (  0.003454)
+  # 0.000000   0.000000   0.000000 (  0.003408)
+# < included_modules.include?(modules.first)
+  # 0.110000   0.010000   0.120000 (  0.113255)
+  # 0.110000   0.000000   0.110000 (  0.112880)
+  # 0.110000   0.000000   0.110000 (  0.121003)
+# < included_modules.include?(modules.last)
+  # 0.040000   0.010000   0.050000 (  0.040736)
+  # 0.040000   0.000000   0.040000 (  0.039609)
+  # 0.030000   0.000000   0.030000 (  0.039888)
+
+# 1000 modules
+# < modules.first
+  # 0.040000   0.000000   0.040000 (  0.044124)
+  # 0.050000   0.000000   0.050000 (  0.046110)
+  # 0.040000   0.000000   0.040000 (  0.042603)
+# < modules.last
+  # 0.000000   0.000000   0.000000 (  0.003405)
+  # 0.010000   0.000000   0.010000 (  0.005510)
+  # 0.000000   0.000000   0.000000 (  0.003562)
+# < included_modules.include?(modules.first)
+  # 0.990000   0.000000   0.990000 (  1.096331)
+  # 1.030000   0.010000   1.040000 (  1.047791)
+  # 0.990000   0.000000   0.990000 (  1.019169)
+# < included_modules.include?(modules.last)
+  # 0.260000   0.000000   0.260000 (  0.265306)
+  # 0.270000   0.000000   0.270000 (  0.311985)
+  # 0.270000   0.000000   0.270000 (  0.277936)