Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Attempt to use selenium for Travis

  • Loading branch information...
commit 589447aef88c6e513e554399c79d8b92815c7298 1 parent ad9ce94
@drapergeek authored
Showing with 20 additions and 7 deletions.
  1. +3 −0  .travis.yml
  2. +1 −1  Gemfile
  3. +16 −4 Gemfile.lock
  4. +0 −2  spec/spec_helper.rb
View
3  .travis.yml
@@ -3,3 +3,6 @@ rvm:
- "1.9.3"
services:
- redis-server
+before_install:
+ - "export DISPLAY=:99.0"
+ - "sh -e /etc/init.d/xvfb start"
View
2  Gemfile
@@ -25,6 +25,6 @@ end
group :test do
gem 'capybara'
- gem 'capybara-webkit'
+ gem 'selenium'
gem 'launchy'
end
View
20 Gemfile.lock
@@ -43,9 +43,6 @@ GEM
rack-test (>= 0.5.4)
selenium-webdriver (~> 2.0)
xpath (~> 0.1.4)
- capybara-webkit (0.13.0)
- capybara (>= 1.0.0, < 1.2)
- json
childprocess (0.3.6)
ffi (~> 1.0, >= 1.0.6)
coffee-rails (3.2.2)
@@ -65,9 +62,20 @@ GEM
flutie (1.3.3)
foreman (0.60.2)
thor (>= 0.13.6)
+ git (1.2.5)
hike (1.2.1)
hiredis (0.4.5)
i18n (0.6.1)
+ jar_wrapper (0.1.2)
+ jeweler
+ jeweler
+ zip
+ zip
+ jeweler (1.8.4)
+ bundler (~> 1.0)
+ git (>= 1.2.5)
+ rake
+ rdoc
journey (1.0.4)
jquery-rails (2.1.4)
railties (>= 3.0, < 5.0)
@@ -132,6 +140,9 @@ GEM
railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3)
+ selenium (0.2.5)
+ jar_wrapper
+ jeweler
selenium-webdriver (2.27.2)
childprocess (>= 0.2.5)
libwebsocket (~> 0.1.3)
@@ -157,6 +168,7 @@ GEM
websocket (1.0.4)
xpath (0.1.4)
nokogiri (~> 1.3)
+ zip (2.0.2)
PLATFORMS
ruby
@@ -165,7 +177,6 @@ DEPENDENCIES
bourbon
bourne
capybara
- capybara-webkit
coffee-rails (~> 3.2.1)
flutie
foreman
@@ -176,5 +187,6 @@ DEPENDENCIES
redis
rspec-rails
sass-rails (~> 3.2.3)
+ selenium
thin
uglifier (>= 1.0.3)
View
2  spec/spec_helper.rb
@@ -40,5 +40,3 @@
redis.flushall
end
end
-
-Capybara.javascript_driver = :webkit
Please sign in to comment.
Something went wrong with that request. Please try again.