Travis fixes

Author: karolselak

.travis.yml

@@ -1,20 +1,33 @@
 rvm: 2.7.2
 cache: bundler
 
-import:
-  - travis-ci/build-configs:db-setup.yml
-
 services:
   - redis
 
-before_install:
-  - gem install bundler
-
 env:
   global:
     - PATH=/snap/bin:$PATH
 
 jobs:
   include:
     - stage: "testing time"
-      script: bundle exec rspec -e test
+      script: bundle exec rspec
+
+dist: xenial
+
+before_install:
+  - gem install bundler
+  - sudo apt-get install -yq --no-install-suggests --no-install-recommends postgresql-common
+  - sudo service postgresql stop
+  - sudo apt install -yq --no-install-suggests --no-install-recommends postgresql-11 postgresql-client-11
+  - sed -e 's/^port.*/port = 5432/' /etc/postgresql/11/main/postgresql.conf > postgresql.conf
+  - sudo chown postgres postgresql.conf
+  - sudo mv postgresql.conf /etc/postgresql/11/main
+  - sudo cp /etc/postgresql/{10,11}/main/pg_hba.conf
+  - sudo service postgresql start 11
+
+before_script:
+  - psql --version
+  - psql -c 'CREATE DATABASE travis_test;' -U postgres
+  - psql -t -c "SELECT 1 FROM pg_roles WHERE rolname='travis'" -U postgres | grep 1 || psql -c 'CREATE ROLE travis SUPERUSER LOGIN CREATEDB;' -U postgres
+  - psql -f db/schema.sql -v ON_ERROR_STOP=1 travis_test

README.md

@@ -5,7 +5,7 @@ to json files and sends them to GCE.
 
 #### Ruby version
 
-2.7.0
+2.7.2
 
 #### Configuration
 

db/schema.sql

@@ -1,5 +1,5 @@
-DROP SCHEMA public CASCADE;
-DROP SCHEMA sqitch CASCADE;
+DROP SCHEMA IF EXISTS public CASCADE;
+DROP SCHEMA IF EXISTS sqitch CASCADE;
 CREATE SCHEMA public;
 
 SET statement_timeout = 0;

lib/config.rb

@@ -19,6 +19,6 @@ def initialize(args={}) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticCom
     @limit = args[:limit] || ENV['BACKUP_LIMIT'] || config['backup']['limit']
     @delay = args[:delay] || ENV['BACKUP_DELAY'] || config['backup']['delay']
     @files_location = args[:files_location] || ENV['BACKUP_FILES_LOCATION'] || config['backup']['files_location']
-    @database_url = args[:database_url] || ENV['DATABASE_URL'] || connection_details['development']
+    @database_url = args[:database_url] || ENV['DATABASE_URL'] || connection_details[ENV['RAILS_ENV']]
   end
 end

spec/backup_spec.rb

@@ -9,7 +9,7 @@
 
 describe Backup do
   before(:all) do
-    system("psql '#{Config.new.database_url}' -f db/schema.sql > /dev/null")
+    system("psql '#{Config.new.database_url}' -f db/schema.sql")
   end
 
   after(:each) do