Skip to content

Commit 64f6a04

Browse files
committed
postgresql 10
1 parent ff76a4e commit 64f6a04

File tree

3 files changed

+10
-7
lines changed

3 files changed

+10
-7
lines changed

.travis.yml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
dist: focal
22

3+
env:
4+
global:
5+
- PGPORT=5433 # NOTE ADDING THIS MAKES NO DIFFERENCE
6+
7+
38
addons:
9+
postgresql: "11"
410
apt:
511
sources:
612
- sourceline: 'deb http://dl.yarnpkg.com/debian/ stable main'
@@ -12,11 +18,8 @@ addons:
1218
- google-chrome-stable
1319
- yarn
1420
- redis-server
15-
# env:
16-
# global:
17-
# - PGPORT=5433 # NOTE ADDING THIS MAKES NO DIFFERENCE
18-
services:
19-
- postgresql
21+
- postgresql-11
22+
- postgresql-client-11
2023

2124

2225
_test_gem_pg: &_test_gem_pg

ruby/hyper-model/spec/spec_helper.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ class JavaScriptError < StandardError; end
336336
# Capybara.register_driver :chrome do |app|
337337
# #caps = Selenium::WebDriver::Remote::Capabilities.chrome("chromeOptions" => {"excludeSwitches" => [ "ignore-certificate-errors" ]})
338338
# caps = Selenium::WebDriver::Remote::Capabilities.chrome("chromeOptions" => {"args" => [ "--window-size=200,200" ]})
339-
# Capybara::Selenium::Driver.new(app, :browser => :chrome, :desired_capabilities => caps)
339+
# Capybara::Selenium::Driver.new(app, :browser => :chrome, :capabilities => caps)
340340
# end
341341

342342
# Use legacy hyper-spec on_client behavior

ruby/hyper-spec/lib/hyper-spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ def self.on_server?
205205
capabilities = Selenium::WebDriver::Remote::Capabilities.chrome(
206206
chromeOptions: options, 'goog:loggingPrefs' => { browser: 'ALL' }
207207
)
208-
Capybara::Selenium::Driver.new(app, browser: :chrome, desired_capabilities: capabilities)
208+
Capybara::Selenium::Driver.new(app, browser: :chrome)#, capabilities: capabilities)
209209
end
210210

211211
Capybara.register_driver :firefox do |app|

0 commit comments

Comments
 (0)