Merge pull request #947 from hennevogel/update_gems

Switch to trusty as base OS

.travis.yml

@@ -1,7 +1,9 @@
+sudo: required
+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`"

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)
@@ -291,12 +292,12 @@ 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
       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)

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