Merge pull request #65 from dblock/update-capybara

Updated Capybara and Selenium-Webdriver.

.travis.yml

@@ -16,9 +16,16 @@ matrix:
       services:
         - mongodb
 
+addons:
+  firefox: 54.0
+
 before_install:
-  - "export DISPLAY=:99.0"
-  - "sh -e /etc/init.d/xvfb start"
+  - export DISPLAY=:99.0
+  - sh -e /etc/init.d/xvfb start
+  - wget https://github.com/mozilla/geckodriver/releases/download/v0.18.0/geckodriver-v0.18.0-linux64.tar.gz
+  - mkdir geckodriver
+  - tar -xzf geckodriver-v0.18.0-linux64.tar.gz -C geckodriver
+  - export PATH=$PATH:$PWD/geckodriver
 
 script:
   - bundle exec rake

CHANGELOG.md

@@ -2,8 +2,9 @@
 
 #### 0.6.2 (Next)
 
-* Your contribution here.
 * [#60](https://github.com/slack-ruby/slack-ruby-bot-server/pull/60): Log caught Standard::Error backtrace at debug-level - [@alexagranov](https://github.com/alexagranov).
+* [#65](https://github.com/slack-ruby/slack-ruby-bot-server/pull/65): Updated Capybara and selenium-webdriver - [@dblock](https://github.com/dblock).
+* Your contribution here.
 
 #### 0.6.1 (3/29/2017)
 

Gemfile

@@ -7,8 +7,8 @@ when 'mongoid' then
   gem 'mongoid-scroll'
 when 'activerecord' then
   gem 'pg'
-  gem 'activerecord'
-  gem 'otr-activerecord'
+  gem 'activerecord', '~> 5.0.0'
+  gem 'otr-activerecord', '~> 1.2.1'
   gem 'cursor_pagination'
 when nil then
   warn "Missing ENV['DATABASE_ADAPTER']."
@@ -34,8 +34,8 @@ group :development, :test do
   gem 'faker'
   gem 'database_cleaner'
   gem 'hyperclient'
-  gem 'capybara'
-  gem 'selenium-webdriver', '~> 2.5'
+  gem 'capybara', '~> 2.15.1'
+  gem 'selenium-webdriver', '~> 3.4.4'
 end
 
 group :test do

sample_apps/sample_app_activerecord/Gemfile

@@ -1,12 +1,12 @@
 source 'https://rubygems.org'
 
 gem 'pg'
-gem 'activerecord', require: 'active_record'
+gem 'activerecord', '~> 5.0.0', require: 'active_record'
 gem 'slack-ruby-bot-server', path: '../../'
 gem 'newrelic-slack-ruby-bot'
 gem 'rack-server-pages'
 gem 'rack-test'
-gem 'otr-activerecord'
+gem 'otr-activerecord', '~> 1.2.1'
 
 group :development, :test do
   gem 'standalone_migrations'

spec/api/cors_spec.rb

@@ -6,23 +6,23 @@
   context 'CORS' do
     it 'supports options' do
       options '/api', {},
-              'HTTP_ORIGIN' => 'http://cors.example.com',
+              'HTTP_ORIGIN' => '*',
               'HTTP_ACCESS_CONTROL_REQUEST_HEADERS' => 'Origin, Accept, Content-Type',
               'HTTP_ACCESS_CONTROL_REQUEST_METHOD' => 'GET'
 
       expect(last_response.status).to eq 200
-      expect(last_response.headers['Access-Control-Allow-Origin']).to eq 'http://cors.example.com'
+      expect(last_response.headers['Access-Control-Allow-Origin']).to eq '*'
       expect(last_response.headers['Access-Control-Expose-Headers']).to eq ''
     end
     it 'includes Access-Control-Allow-Origin in the response' do
-      get '/api', {}, 'HTTP_ORIGIN' => 'http://cors.example.com'
+      get '/api', {}, 'HTTP_ORIGIN' => '*'
       expect(last_response.status).to eq 200
-      expect(last_response.headers['Access-Control-Allow-Origin']).to eq 'http://cors.example.com'
+      expect(last_response.headers['Access-Control-Allow-Origin']).to eq '*'
     end
     it 'includes Access-Control-Allow-Origin in errors' do
-      get '/api/invalid', {}, 'HTTP_ORIGIN' => 'http://cors.example.com'
+      get '/api/invalid', {}, 'HTTP_ORIGIN' => '*'
       expect(last_response.status).to eq 404
-      expect(last_response.headers['Access-Control-Allow-Origin']).to eq 'http://cors.example.com'
+      expect(last_response.headers['Access-Control-Allow-Origin']).to eq '*'
     end
   end
 end

spec/api/endpoints/root_endpoint_spec.rb

@@ -26,9 +26,4 @@
     expect(last_response.status).to eq 302
     expect(last_response.headers['Location']).to eq '/api/teams/'
   end
-  it 'rewrites unencoded HAL links to make them clickable' do
-    get '/api/teams/%7B?cursor,size}'
-    expect(last_response.status).to eq 302
-    expect(last_response.headers['Location']).to eq '/api/teams/'
-  end
 end

spec/support/capybara.rb

@@ -1,4 +1,5 @@
 require 'capybara/rspec'
+
 Capybara.configure do |config|
   config.app = SlackRubyBotServer::Api::Middleware.instance
   config.server_port = 9293