opal-rspec 0.5.0.beta1 → 0.5.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dbd011de53ddb59b6953bb90ecddf3082402cc8d
-  data.tar.gz: cfb1bcebd79e37b25dda19aaa9b57e173c446154
+  metadata.gz: c317905daac139b9a3b70651c7c9305a7279078f
+  data.tar.gz: 00b344281961f64460a8b667c2ac849c8de70b3d
 SHA512:
-  metadata.gz: dea4bff6ec1be0af8b3d3f205407cdbeff969307fd5ae8817653762c5099428c359756ec9ea55630e38350a9b302b41e8dcc091a05c7f8429ca927ba207170ab
-  data.tar.gz: a0ba39d3e3851bf95ad496da0635dd9b0bd2db21aa8875a77da7fa4c3f5a9984f65cd8421fcde54dcc5434ecc5fc85fccd25e639af1c69880a2054a9e3064128
+  metadata.gz: 2c916613b1f125e6ee5f17cf56cee9c8e5f41bda97741c4deedc825f43c0d780533147c72c77d42d6a320d1ad51a54f62920b9dee84cfb8fa80ab8269285ec7c
+  data.tar.gz: de0c3fcf3536cc6f59bfc8c404f7f9d4e6c299e445fbaa2e240c970570493e6bc4bf03df40d8a441d67ffae5e445247fc2b833e42d4864ee5be6aec3a2195f98

data/.travis.yml

@@ -9,5 +9,9 @@ rvm:
 before_install:
   - git submodule update --init
 
+before_script:
+  - "export DISPLAY=:99.0"
+  - "sh -e /etc/init.d/xvfb start"
+
 notifications:
   irc: "irc.freenode.org#opal"

data/Gemfile

@@ -7,3 +7,6 @@ end
 
 # Opal 0.9 still in development
 # gem 'opal', git: 'https://github.com/opal/opal.git'
+gem 'rspec'
+gem 'capybara-webkit'
+gem 'selenium-webdriver'

data/Rakefile

@@ -1,10 +1,11 @@
 require 'bundler'
+require 'rspec/core/rake_task'
 Bundler.require
 
 Bundler::GemHelper.install_tasks
 
 require 'opal/rspec/rake_task'
-Opal::RSpec::RakeTask.new(:specs_untested)
+Opal::RSpec::RakeTask.new(:specs_via_rake)
 
 desc 'Generates an RSpec requires file free of dynamic requires'
 task :generate_requires do
@@ -12,8 +13,15 @@ task :generate_requires do
   sh 'ruby -Irspec/lib -Irspec-core/lib/rspec -Irspec-support/lib/rspec util/create_requires.rb'
 end
 
-task :default do
-  test_output = `rake specs_untested`
+RSpec::Core::RakeTask.new :browser_specs do |t|
+  t.pattern = 'spec_mri/**/*_spec.rb'
+end
+
+task :default => [:verify_rake_specs, :browser_specs]
+
+desc 'Will run a spec suite (rake specs_via_rake) and check for expected combination of failures and successes'
+task :verify_rake_specs do
+  test_output = `rake specs_via_rake`
   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)
   raise 'Expected a finished count of test failures/success/etc. but did not see it' unless count_match

data/lib/opal/rspec/version.rb

@@ -1,5 +1,5 @@
 module Opal
   module RSpec
-    VERSION = '0.5.0.beta1'
+    VERSION = '0.5.0.beta2'
   end
 end

data/opal/opal/rspec/fixes/kernel.rb

@@ -13,22 +13,35 @@ module Kernel
     stack = `err.stack`
     caller_lines = stack.split("\n")[4..-1]
     caller_lines.reject! {|l| l.strip.empty? }
+    
+    result_formatter = lambda do |filename, line, method=nil|
+      "#{filename}:#{line} in `(#{method ? method : 'unknown method'})'"
+    end
+    
     caller_lines.map do |raw_line|
       if match = /\s*at (.*) \((\S+):(\d+):\d+/.match(raw_line)
         method, filename, line = match.captures
-        "#{filename}:#{line} in `#{method}'"
+        result_formatter[filename, line, method]
       elsif match = /\s*at (\S+):(\d+):\d+/.match(raw_line)
         filename, line = match.captures
-        "#{filename}:#{line} in `(unknown method)'"
+        result_formatter[filename, line]
       # catch phantom/no 2nd line/col #
       elsif match = /\s*at (.*) \((\S+):(\d+)/.match(raw_line)
         method, filename, line = match.captures
-        "#{filename}:#{line} in `#{method}'"
+        result_formatter[filename, line, method]
       elsif match = /\s*at (.*):(\d+)/.match(raw_line)
         filename, line = match.captures
-        "#{filename}:#{line} in `(unknown method)'"
+        result_formatter[filename, line]
+      # Firefox - Opal.modules["rspec/core/metadata"]/</</</</def.$populate@http://192.168.59.103:9292/assets/rspec/core/metadata.self.js?body=1:102:13
+      elsif match = /(.*?)@(\S+):(\d+):\d+/.match(raw_line)
+        method, filename, line = match.captures
+        result_formatter[filename, line, method]
+      # webkit - http://192.168.59.103:9292/assets/opal/rspec/sprockets_runner.js:45117:314
+      elsif match = /(\S+):(\d+):\d+/.match(raw_line)
+        filename,line = match.captures
+        result_formatter[filename, line]
       else
-        raise "Don't know how to parse #{raw_line}!"
+        "#{filename}:-1 in `(can't parse this stack trace)`"
       end
     end
   end

data/spec_mri/integration/browser_spec.rb

@@ -0,0 +1,37 @@
+require 'rspec'
+require 'capybara/rspec'
+require 'capybara-webkit'
+
+# Use Rack config exactly as shipped in the GEM
+Capybara.app = Rack::Builder.new_from_string(File.read('config.ru'))
+
+describe 'browser formatter', type: :feature, js: true do
+  RSpec.shared_examples :browser do
+    before do            
+      visit '/'
+      # Specs should run in 12 seconds but in case Travis takes longer, provide some cushion
+      Capybara.default_wait_time = 40
+    end
+    
+    it 'matches test results' do
+      expect(page).to have_content '182 examples, 65 failures, 22 pending'
+    end    
+  end
+  
+  context 'Webkit' do
+    before do
+      Capybara.javascript_driver = :webkit
+    end   
+    
+    include_examples :browser
+  end
+  
+  # TODO: This passes in my local tests (Firefox 40.0.2), but something in the Travis environment causes it to fail
+  xcontext 'Firefox' do
+    before do
+      Capybara.javascript_driver = :selenium
+    end   
+    
+    include_examples :browser
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opal-rspec
 version: !ruby/object:Gem::Version
-  version: 0.5.0.beta1
+  version: 0.5.0.beta2
 platform: ruby
 authors:
 - Adam Beynon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-13 00:00:00.000000000 Z
+date: 2015-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal
@@ -532,6 +532,7 @@ files:
 - spec/should_syntax_spec.rb
 - spec/skip_pending_spec.rb
 - spec/subject_spec.rb
+- spec_mri/integration/browser_spec.rb
 - util/create_requires.rb
 - vendor/spec_runner.js
 homepage: http://opalrb.org