opal-rspec 0.6.2 → 0.7.0.rc.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75ebf6988b2018f0174da74e1232e9b34fc5d7934d459e1bc58a70afac085af7
-  data.tar.gz: 302016b488d81915ae5d6bda8e249ee4d37eaa948a19f2037a6a2acd2cf49fe7
+  metadata.gz: ea42ddfb8b64b16fb6c520b5e691f58c26ce6215f1cc65992c1819a4f918bbaa
+  data.tar.gz: f5c3399910e91971c49f72d94ec510950545a3fa76e6d765f70a0fb8ad766bca
 SHA512:
-  metadata.gz: 4c665b19023aecb9310c533e418931c77a47a59b85f9b9d46db5494ad5a50556529b6d600307dcf8efd1623f9bae7d7d4a9ec43374c1350c78e1020a59ccc603
-  data.tar.gz: b0213c7196ef7fa86757420e8d4b4c665db2df1badd0de94fbf4d7ed6bfa85741584116082ebaee0e9275e145bcc9dd94146eae2f62163dd4c0f1b5f2a005cb7
+  metadata.gz: 391ad3c77faf6eb6fe4cc9445862475c6588f7806d588367150c116429ff8026ed631ebb8307afa41d5e2cb78a102acf1afa1c522038f1b7a63138d85019bf91
+  data.tar.gz: 15499b0d9ae6444b7eae71d6c9ee98e2bdee75eca22345c559390782ee0fb59c45c039a8613483d9d50a82b3370b52fff3e5fed7b52c6c8bdcb9956b0e4cd6ff

data/.gitmodules

@@ -1,15 +1,15 @@
 [submodule "rspec"]
-	path = rspec
+	path = rspec/upstream
 	url = https://github.com/rspec/rspec.git
 [submodule "rspec-support"]
-	path = rspec-support
+	path = rspec-support/upstream
 	url = https://github.com/rspec/rspec-support.git
 [submodule "rspec-core"]
-	path = rspec-core
+	path = rspec-core/upstream
 	url = https://github.com/rspec/rspec-core.git
 [submodule "rspec-mocks"]
-	path = rspec-mocks
+	path = rspec-mocks/upstream
 	url = https://github.com/rspec/rspec-mocks.git
 [submodule "rspec-expectations"]
-	path = rspec-expectations
+	path = rspec-expectations/upstream
 	url = https://github.com/rspec/rspec-expectations.git

data/.travis.yml

@@ -5,30 +5,58 @@ cache:
   bundler: true
   directories:
   - node_modules
-
-env:
-  global:
-    - OPAL_VERSION="~> 0.10.0"
+  - phantom20
 
 matrix:
-  fast_finish: true
-
   include:
-    - rvm: 2.4.5
-      env: RUN=mri_sanity_check
-    - rvm: 2.3.8
-      env: RUN=mri_sanity_check
-    - rvm: 2.5.3
-      env: RUN=mri_sanity_check
-    - rvm: 2.5.3
-      env: RUN=rake_only
-    - rvm: 2.5.3
-      env: RUNNER=node RUN=rake_only
+    # - rvm: 2.5.1
+    # - rvm: 2.4.2
+    # - rvm: 2.3.7
+    # - rvm: 2.4.1
+    #   # PHANTOMJS env variable is not used but it makes it easier to differentiate this build in Travis
+    #   env: PHANTOMJS=2.1 RUN=rake_only
+    #   before_install:
+    #     # Attempt to work around Travis issues and Ruby 2.3 - https://github.com/vcr/vcr/issues/582
+    #     - gem update --system
+    #     - "export PATH=`pwd`/node_modules/phantomjs-prebuilt/bin:$PATH"
+    #     - "echo $PATH"
+    #     - phantomjs -v | grep 2.1 || npm install phantomjs-prebuilt # get rate limits from bitbucket download source, so get from NPM if we don't have it already
+    # - rvm: 2.4.1
+    #   env: RUNNER=node RUN=rake_only
+    # - rvm: 2.5.1
+    #   env: RUN=rspec
+    #   gemfile: gemfiles/opal_master.gemfile
+    # - rvm: 2.5.1
+    #   env: RUN=rspec
+    #   gemfile: gemfiles/opal_0.10_stable.gemfile
+
+  allow_failures:
+    - gemfile: gemfiles/opal_master.gemfile
+
+gemfile:
+  - gemfiles/opal_0.11.gemfile
+  - gemfiles/opal_master.gemfile
 
 before_install:
-  - "export PATH=`pwd`/node_modules/phantomjs-prebuilt/bin:$PATH"
+  # Attempt to work around Travis issues and Ruby 2.3 - https://github.com/vcr/vcr/issues/582
+  - gem update --system
+  - gem install bundler
+  - "mkdir -p phantom20"
+  - "export PATH=`pwd`/phantom20:$PATH"
   - "echo $PATH"
-  - phantomjs -v | grep 2.1 || npm install phantomjs-prebuilt # get rate limits from bitbucket download source, so get from NPM if we don't have it already
+  - "pushd phantom20"
+  - "ls phantomjs || curl -L -O https://s3.amazonaws.com/travis-phantomjs/phantomjs-2.0.0-ubuntu-12.04.tar.bz2"
+  - "ls phantomjs || tar xjvf phantomjs-2.0.0-ubuntu-12.04.tar.bz2"
+  - "rm -rf phantomjs-2.0.0-ubuntu-12.04.tar.bz2"
+  - "popd"
+
+# before_script:
+#   - "export DISPLAY=:99.0"
+#   - "sh -e /etc/init.d/xvfb start"
+#   - "phantomjs -v"
+#   - "node -v"
+#   - "firefox --version"
 
 script:
-  - "bundle exec rake $RUN"
+  - "bundle exec exe/opal-rspec spec-opal-passing"
+  - "bundle exec rspec"

data/Appraisals

@@ -0,0 +1,9 @@
+appraise 'opal-0.11' do
+  gem 'opal', '~> 0.11.0'
+  gem 'opal-sprockets'
+end
+
+appraise 'opal-master' do
+  gem 'opal', git: 'https://github.com/opal/opal.git'
+  gem 'opal-sprockets', github: 'opal/opal-sprockets'
+end

data/CHANGELOG.md

@@ -1,10 +1,8 @@
-## 0.6.2 - 2018-11-09
+## 0.7.0 - Unreleased
 
-- Updated the homepage url
-
-- Only test against Opal v0.10, v0.11 will be supported in opal-rspec v0.7
-
-- Add support for multiple formats in `SPEC_OPTS` and allow both `--format` and `-f`
+- Drop support for the legacy async syntax
+- Complete internal overhaul
+- Support for Opal v0.11.1
 
 
 ## 0.6.1 - 2017-05-25

data/Gemfile

@@ -1,15 +1,15 @@
 source 'https://rubygems.org'
 gemspec
 
-unless Dir['rspec{,-{core,expectations,mocks,support}}'].any?
-  warn 'Run: "git submodule update --init" to get RSpec sources'
+unless Dir['rspec{,-{core,expectations,mocks,support}}/upstream'].any?
+  raise 'Run: "git submodule update --init" to get RSpec sources'
 end
 
-gem "opal", git: "https://github.com/opal/opal.git", branch: "0-10-stable"
-
 # These need to come from our local path in order for create_requires.rb to work properly
-gem 'rspec',              path: 'rspec'
-gem 'rspec-support',      path: 'rspec-support'
-gem 'rspec-core',         path: 'rspec-core'
-gem 'rspec-mocks',        path: 'rspec-mocks'
-gem 'rspec-expectations', path: 'rspec-expectations'
+gem 'rspec',              path: 'rspec/upstream'
+gem 'rspec-support',      path: 'rspec-support/upstream'
+gem 'rspec-core',         path: 'rspec-core/upstream'
+gem 'rspec-mocks',        path: 'rspec-mocks/upstream'
+gem 'rspec-expectations', path: 'rspec-expectations/upstream'
+
+gem 'pry'

data/README.md

@@ -6,7 +6,7 @@
 
 An attempt at a compatibility layer of RSpec for Opal.
 
-#### For the README for the latest release, click [here](https://github.com/opal/opal-rspec/blob/releases/0-5-stable/README.md).
+#### For the README for the latest release, click [here](https://github.com/opal/opal-rspec/blob/releases/0-6-stable/README.md).
 
 ## Usage
 
@@ -124,7 +124,7 @@ server. Add the following to a `config.ru` file (see config.ru in this GEM):
 
 ```ruby
 require 'opal/rspec'
-# or use Opal::RSpec::SprocketsEnvironment.new(spec_pattern='spec/opal/**/*_spec.{rb,opal}') to customize the pattern
+# or use Opal::RSpec::SprocketsEnvironment.new(spec_pattern='spec-opal/**/*_spec.{rb,opal}') to customize the pattern
 sprockets_env = Opal::RSpec::SprocketsEnvironment.new
 run Opal::Server.new(sprockets: sprockets_env) { |s|
   s.main = 'opal/rspec/sprockets_runner'

data/Rakefile

@@ -1,185 +1,7 @@
 require 'bundler'
-require 'rspec/core/rake_task'
+Bundler.require
 
-Bundler::GemHelper.install_tasks
+import 'tasks/testing.rake'
+import 'tasks/building.rake'
 
-require 'opal/rspec/rake_task'
-require_relative 'spec/rspec/core/core_spec_loader'
-require_relative 'spec/rspec/expectations/expectation_spec_loader'
-require_relative 'spec/rspec/support/support_spec_loader'
-require_relative 'spec/rspec/mocks/mocks_spec_loader'
-
-desc 'Run the full suite, this can time out on Travis'
-task :default => [:unit_specs,
-                  :verify_opal_specs,
-                  :integration_specs,
-                  :verify_rspec_specs]
-
-desc 'Run only tests that use the opal-rspec Rake task'
-task :rake_only => [:verify_rspec_specs,
-                    :verify_opal_specs]
-
-desc 'Sanity checks a given version of MRI and run a basic check'
-task :mri_sanity_check => [:unit_specs,
-                           :integration_specs]
-
-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'
-task :generate_requires do
-  # Do this free of any requires used to make this Rake task happen
-  sh 'ruby -Irspec/lib -Irspec-core/lib/rspec -Irspec-support/lib/rspec util/create_requires.rb'
-end
-
-# Rake.application.last_comment was removed in Rake v12.0
-# https://github.com/ruby/rake/commit/e76242ce7ef94568399a50b69bda4b723dab7c75
-def (Rake.application).last_comment; last_description; end unless Rake.application.respond_to? :last_comment
-desc 'Runs a test to test browser based specs using Opal specs in spec/opal'
-RSpec::Core::RakeTask.new :integration_specs do |t|
-  t.pattern = 'spec/mri/integration/**/*_spec.rb'
-end
-
-desc 'Unit tests for MRI focused components of opal-rspec'
-RSpec::Core::RakeTask.new :unit_specs do |t|
-  t.pattern = 'spec/mri/unit/**/*_spec.rb'
-  t.exclude_pattern = 'spec/mri/unit/opal/rspec/opal/**/*'
-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)
-Opal::RSpec::ExpectationSpecLoader.rake_tasks_for(:rspec_expectation_specs)
-Opal::RSpec::SupportSpecLoader.rake_tasks_for(:rspec_support_specs)
-Opal::RSpec::MocksSpecLoader.rake_tasks_for(:rspec_mocks_specs)
-
-# These are done
-desc 'Verifies all RSpec specs'
-task :verify_rspec_specs => [
-  :verify_rspec_support_specs,
-  :verify_rspec_core_specs,
-  :verify_rspec_expectation_specs,
-  :verify_rspec_mocks_specs
-]
-
-desc 'Verifies other_spec_dir task ran correctly'
-task :verify_other_specs do
-  test_output = `rake other_specs --trace`
-  unless /1 example, 0 failures/.match(test_output)
-    raise "Expected 1 passing example, but got output '#{test_output}'"
-  end
-  puts 'Test successful'
-end
-
-desc 'Will run a spec suite (rake opal_specs) and check for expected combination of failures and successes'
-task :verify_opal_specs do
-  require 'tempfile'
-
-  test_output = Tempfile.create('opal_specs') do |f|
-    `bundle exec rake opal_specs --trace > #{f.path}`
-    File.read f.path
-  end
-  test_output.force_encoding 'UTF-8'
-  raise "Expected test runner to fail due to failed tests, but got return code of #{$?.exitstatus}" if $?.success?
-  count_match = /(\d+) examples, (\d+) failures, (\d+) pending/.match(test_output)
-
-  unless count_match
-    raise "Expected a finished count of test failures/success/etc. but did not see it\n" +
-    "Expected /(\d+) examples, (\d+) failures, (\d+) pending/ to match:\n\n> #{test_output.gsub("\n", "\n> ")}"
-  end
-
-  total, failed, pending = count_match.captures
-
-  actual_failures = []
-  test_output.scan /\d+\) (.*)/ do |match|
-    actual_failures << match[0].strip
-  end
-  actual_failures.sort!
-
-  failure_messages = []
-
-  bad_strings = [/.*is still running, after block problem.*/,
-                 /.*should not have.*/,
-                 /.*Expected \d+ after hits but got \d+.*/,
-                 /.*Expected \d+ around hits but got \d+.*/]
-
-  bad_strings.each do |regex|
-    test_output.scan(regex) do |match|
-      failure_messages << "Expected not to see #{regex} in output, but found match #{match}"
-    end
-  end
-
-  expected_pending_count = 12
-  expected_failures = File.read('spec/opal/expected_failures.txt').split("\n").compact.sort
-
-  if actual_failures != expected_failures
-    unexpected = actual_failures - expected_failures
-    missing = expected_failures - actual_failures
-    failure_messages << "Expected test failures do not match actual\n"
-    failure_messages << "\nUnexpected fails:\n#{unexpected.join("\n")}\n\nMissing fails:\n#{missing.join("\n")}\n\n"
-  end
-
-  failure_messages << "Expected #{expected_pending_count} pending examples but actual was #{pending}" unless pending == expected_pending_count.to_s
-
-  if failure_messages.empty?
-    puts 'Test successful!'
-    puts "#{total} total specs, #{failed} expected failures, #{pending} expected pending"
-  else
-    raise "Test failed, reasons:\n\n#{failure_messages.join("\n")}\n"
-  end
-end
-
-desc "Build build/opal-rspec.js"
-task :dist do
-  require 'fileutils'
-  FileUtils.mkdir_p 'build'
-
-  builder = Opal::Builder.new(stubs: Opal::Config.stubbed_files, # stubs already specified in lib/opal/rspec.rb
-                              compiler_options: { dynamic_require_severity: :ignore }) # RSpec is full of dynamic requires
-  src = builder.build('opal-rspec')
-
-  min = uglify src
-  gzp = gzip min
-
-  File.open('build/opal-rspec.js', 'w+') do |out|
-    out << src
-  end
-
-  puts "development: #{src.size}, minified: #{min.size}, gzipped: #{gzp.size}"
-end
-
-# Used for uglifying source to minify
-def uglify(str)
-  IO.popen('uglifyjs', 'r+') do |i|
-    i.puts str
-    i.close_write
-    return i.read
-  end
-rescue Errno::ENOENT
-  $stderr.puts '"uglifyjs" command not found (install with: "npm install -g uglify-js")'
-  nil
-end
-
-# Gzip code to check file size
-def gzip(str)
-  IO.popen('gzip -f', 'r+') do |i|
-    i.puts str
-    i.close_write
-    return i.read
-  end
-rescue Errno::ENOENT
-  $stderr.puts '"gzip" command not found, it is required to produce the .gz version'
-  nil
-end
+task :default => [:rspec]

data/bin/console

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require "opal/rspec"
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require "irb"
+IRB.start(__FILE__)

data/{util/create_requires.rb → bin/generate_requires}

@@ -1,6 +1,14 @@
-# Usage: `rake generate_requires`
+#!/usr/bin/env ruby
+
+ROOT = "#{__dir__}/.."
+$LOAD_PATH.unshift "#{ROOT}/rspec/upstream/lib"
+$LOAD_PATH.unshift "#{ROOT}/rspec-core/upstream/lib"
+$LOAD_PATH.unshift "#{ROOT}/rspec-expectations/upstream/lib"
+$LOAD_PATH.unshift "#{ROOT}/rspec-mocks/upstream/lib"
+$LOAD_PATH.unshift "#{ROOT}/rspec-support/upstream/lib"
 
 require 'json'
+require 'pathname'
 
 # Opal will not have the built-in RNG, which affects the required outcome
 Object.send(:remove_const, :Random)
@@ -8,8 +16,8 @@ Object.send(:remove_const, :Random)
 # These scripts allow a leaner top level spec (like noted here)
 BASE_FILES = %w{rspec rspec/mocks rspec/expectations rspec/core rspec/core/mocking_adapters/rspec}
 FORMATTERS = %w{base_formatter base_text_formatter progress_formatter documentation_formatter html_printer json_formatter}.map {|f| "rspec/core/formatters/#{f}"}
-MATCHERS = Dir.glob('rspec-expectations/lib/rspec/matchers/built_in/**/*.rb').map do |each_file|
-  path = Pathname.new(each_file).relative_path_from(Pathname.new('rspec-expectations/lib')).to_s
+MATCHERS = Dir.glob('rspec-expectations/upstream/lib/rspec/matchers/built_in/**/*.rb').map do |each_file|
+  path = Pathname.new(each_file).relative_path_from(Pathname.new('rspec-expectations/upstream/lib')).to_s
   path.sub File.extname(path), ''
 end
 MOCK_STUFF = %w{matchers/expectation_customization any_instance}.map { |f| "rspec/mocks/#{f}" }
@@ -17,19 +25,19 @@ REQUIRES = BASE_FILES + FORMATTERS + MATCHERS + MOCK_STUFF
 
 # Should not need to edit below this
 
-ROOTS = Dir[__dir__+'/../rspec{,-{core,expectations,mocks,support}}/lib'].map {|root| File.expand_path(root)}
+ROOTS = Dir[__dir__+'/../rspec{,-{core,expectations,mocks,support}}/upstream/lib'].map {|root| File.expand_path(root)}
 ROOTS_REGEXP = /\A(#{ROOTS.map {|r| Regexp.escape r}.join('|')})\//
 
 module Kernel
-  alias :orig_require :require
+  alias :require_before_opal_rspec :require
   def require path
-    result = orig_require(path)
+    result = require_before_opal_rspec(path)
     puts "requiring: #{path} (#{result})"
     RSPEC_PATHS << path
     result
   end
 
-  alias :orig_require_relative :require_relative
+  alias :require_relative_before_opal_rspec :require_relative
   def require_relative path
     base = File.dirname(caller(1,1).first)
     path_for_require = File.expand_path(path, base).sub(ROOTS_REGEXP, '')
@@ -43,7 +51,9 @@ REQUIRES.each {|r| require r }
 # Put top level items first
 requires = RSPEC_PATHS.uniq.sort
 
-File.open 'opal/opal/rspec/requires.rb', 'w' do |file|
-  file << "# Generated automatically by util/normalize_requires.rb, triggered by Rake task :generate_requires, do not edit\n"
-  file << requires.map { |p| "require '#{p}'" }.join("\n")
+File.open "#{ROOT}/lib-opal/opal/rspec/requires.rb", 'w' do |file|
+  file.puts "# Generated automatically by #{$0}"
+  requires.each do |path|
+    file.puts "require '#{path}'"
+  end
 end