[snapshot]

opal · Feb 4, 2014 · badfdc1 · badfdc1
1 parent 2a3200b
commit badfdc1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/Gemfile b/Gemfile
@@ -2,6 +2,7 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'capybara-webkit'
+gem 'capybara', '< 2'
 
 gem 'opal',        :github => 'opal/opal'
 gem 'opal-jquery', :github => 'opal/opal-jquery'
@@ -15,5 +16,4 @@ if RUBY_VERSION.to_f < 1.9
   gem 'nokogiri', '< 1.6'
   gem 'rails',    '< 4.0'
   gem 'rubyzip',  '< 1'
-  gem 'capybara', '< 2'
 end
diff --git a/spec/integration/in_browser_specs_spec.rb b/spec/integration/in_browser_specs_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-feature 'In-browser specs runner' do
+feature 'In-browser specs runner', type: :request do
   scenario 'runs all specs', :js do
     visit '/opal_spec'
 

diff --git a/spec/support/capybara.rb b/spec/support/capybara.rb
@@ -1,6 +1,4 @@
 require 'capybara/rspec'
 
-# unless ENV['CI']
-  require 'capybara-webkit'
-  Capybara.javascript_driver = :webkit
-# end
+require 'capybara-webkit'
+Capybara.javascript_driver = :webkit