From fa8d0a993c9d845991ea4b8a64928d1d0d58c462 Mon Sep 17 00:00:00 2001
From: Henne Vogelsang <hvogel@opensuse.org>
Date: Tue, 5 Apr 2016 12:51:10 +0200
Subject: [PATCH 1/5] Update phantomjs to latest version

---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 3dbe24fe..e5b1a6ca 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -291,7 +291,7 @@ GEM
     parser (2.3.0.3)
       ast (~> 2.2)
     pdf-core (0.2.5)
-    phantomjs (1.9.7.1)
+    phantomjs (2.1.1.0)
     piwik_analytics (1.0.2)
       actionpack
       activesupport

From 779004e7e396ef1e36c2b61bcc200d806004203a Mon Sep 17 00:00:00 2001
From: Henne Vogelsang <hvogel@opensuse.org>
Date: Tue, 5 Apr 2016 12:55:04 +0200
Subject: [PATCH 2/5] Switch travis to trusty builds

https://docs.travis-ci.com/user/trusty-ci-environment/
---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 3868df80..edf93919 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,5 @@
+sudo: required
+dist: trusty
 language: ruby
 cache: bundler
 rvm:

From a79193f7aff4680e8f7586376a79312c95d9e6a9 Mon Sep 17 00:00:00 2001
From: Henne Vogelsang <hvogel@opensuse.org>
Date: Tue, 5 Apr 2016 13:02:53 +0200
Subject: [PATCH 3/5] Switch to ruby 2.2.3

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index edf93919..050f1f04 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,7 @@ dist: trusty
 language: ruby
 cache: bundler
 rvm:
-  - 2.1.1
+  - 2.2.3
 before_install:
   - "echo 'gem: --no-ri --no-rdoc' > ~/.gemrc"
   - "echo `phantomjs -v`"

From 7b40f3ceb602e098a3e69f1c2242c6f7ed77e6f7 Mon Sep 17 00:00:00 2001
From: Henne Vogelsang <hvogel@opensuse.org>
Date: Tue, 5 Apr 2016 13:18:40 +0200
Subject: [PATCH 4/5] Update poltergeist

---
 Gemfile.lock | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index e5b1a6ca..8279eaa5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -86,7 +86,8 @@ GEM
       columnize (~> 0.8)
       debugger-linecache (~> 1.2)
     cancancan (1.13.1)
-    capybara (2.2.1)
+    capybara (2.6.2)
+      addressable
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
@@ -296,7 +297,7 @@ GEM
       actionpack
       activesupport
       rails (>= 3.0.0)
-    poltergeist (1.5.1)
+    poltergeist (1.9.0)
       capybara (~> 2.1)
       cliver (~> 0.3.1)
       multi_json (~> 1.0)
@@ -481,7 +482,9 @@ GEM
     webmock (1.20.4)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
-    websocket-driver (0.3.3)
+    websocket-driver (0.6.3)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.2)
     whenever (0.9.2)
       activesupport (>= 2.3.4)
       chronic (>= 0.6.3)

From be422150034378398f2260e6059f18b445be8ccb Mon Sep 17 00:00:00 2001
From: Henne Vogelsang <hvogel@opensuse.org>
Date: Tue, 5 Apr 2016 14:45:47 +0200
Subject: [PATCH 5/5] phantomjs doesn't like color pickers...

---
 spec/features/event_types_spec.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/spec/features/event_types_spec.rb b/spec/features/event_types_spec.rb
index c9122513..cf9016f6 100644
--- a/spec/features/event_types_spec.rb
+++ b/spec/features/event_types_spec.rb
@@ -6,14 +6,14 @@ feature EventType do
   let!(:organizer) { create(:user, role_ids: [organizer_role.id]) }
 
   shared_examples 'event types' do
-    scenario 'adds and updates event type', feature: true, js: true do
+    scenario 'adds and updates event type', feature: true do
 
       sign_in organizer
       visit admin_conference_program_event_types_path(
                 conference_id: conference.short_title)
 
       within('table#event_types') do
-        expect(page.assert_selector('tr', count: 3)).to be true
+        expect(page.assert_selector('tr', count: 2)).to be true
       end
 
       # Add event type
@@ -33,7 +33,7 @@ feature EventType do
         expect(page.has_content?('Party')).to be true
         expect(page.has_content?('13042')).to be true
         expect(page.has_content?('#e4e4e4')).to be true
-        expect(page.assert_selector('tr', count: 4)).to be true
+        expect(page.assert_selector('tr', count: 3)).to be true
       end
 
       # Remove event type
@@ -43,7 +43,7 @@ feature EventType do
       expect(flash).to eq('Event type successfully deleted.')
 
       within('table#event_types') do
-        expect(page.assert_selector('tr', count: 3)).to be true
+        expect(page.assert_selector('tr', count: 2)).to be true
         expect(page.has_content?('Party')).to be false
       end
     end