Merge pull request #381 from marcmillien/fix-tests

Fix tests

.travis.yml

@@ -1,7 +1,14 @@
 sudo: false
 language: ruby
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.5
-  - 2.2.0
+  - 2.2
+  - 2.3
+  - 2.4
+  - 2.5
+addons:
+  chrome: stable
+  apt:
+    packages:
+    - chromium-chromedriver
+before_script:
+  - ln -s /usr/lib/chromium-browser/chromedriver ~/bin/chromedriver

mailcatcher.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
   s.executables = ["mailcatcher", "catchmail"]
   s.extra_rdoc_files = ["README.md", "LICENSE"]
 
-  s.required_ruby_version = ">= 1.9.3"
+  s.required_ruby_version = ">= 2.0.0"
 
   s.add_dependency "eventmachine", "1.0.9.1"
   s.add_dependency "mail", "~> 2.3"
@@ -39,12 +39,12 @@ Gem::Specification.new do |s|
   s.add_dependency "skinny", "~> 0.2.3"
 
   s.add_development_dependency "coffee-script"
-  s.add_development_dependency "compass"
+  s.add_development_dependency "compass", "~> 1.0.3"
   s.add_development_dependency "minitest", "~> 5.0"
   s.add_development_dependency "rake"
   s.add_development_dependency "rdoc"
   s.add_development_dependency "sass"
-  s.add_development_dependency "selenium-webdriver"
+  s.add_development_dependency "selenium-webdriver", "~> 3.7"
   s.add_development_dependency "sprockets"
   s.add_development_dependency "sprockets-sass"
   s.add_development_dependency "sprockets-helpers"

spec/acceptance_spec.rb

@@ -45,10 +45,19 @@ def deliver_example(name, options={})
   end
 
   def selenium
-    @selenium ||= Selenium::WebDriver.for(:phantomjs)
+    @selenium ||=
+      begin
+        options = Selenium::WebDriver::Chrome::Options.new
+        options.headless!
+        options.add_argument "no-sandbox" if ENV["TRAVIS"]
+
+        Selenium::WebDriver.for(:chrome, options: options)
+      end
   end
 
-  before { selenium.navigate.to("http://127.0.0.1:#{HTTP_PORT}") }
+  before do
+    selenium.navigate.to("http://127.0.0.1:#{HTTP_PORT}")
+  end
 
   def messages_element
     selenium.find_element(:id, "messages")