Merge pull request #538 from DefactoSoftware/jurre/fix-specs

Fix feature specs

Author: jurre

.travis.yml

@@ -1,11 +1,15 @@
+dist: trusty
 rvm:
 - 2.4.2
 bundler_args: "--without debug development"
 cache: bundler
+services:
+  - postgresql
 before_script:
 - cp .sample.env .env
 - export SECRET_KEY_BASE="$(bundle exec rake secret)"
 - cp config/database.travis.yml config/database.yml
 - psql -c 'create database hours_test' -U postgres
-- export DISPLAY=:99.0
-- sh -e /etc/init.d/xvfb start
+- "export DISPLAY=:99.0"
+- "sh -e /etc/init.d/xvfb start"
+- sleep 3 # give xvfb some time to start

Gemfile

@@ -73,7 +73,7 @@ group :development, :test do
 end
 
 group :test do
-  gem 'capybara', '~> 3.16', '>= 3.16.1'
+  gem 'capybara'
   gem "database_cleaner"
   gem "launchy"
   gem "shoulda-matchers", "~> 2.7.0"

Gemfile.lock

@@ -36,7 +36,8 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.3.6)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
     airbrake (8.1.2)
       airbrake-ruby (~> 3.2)
     airbrake-ruby (3.2.4)
@@ -615,13 +616,13 @@ GEM
       slim (>= 1.3.6, < 4.0)
       terminal-table (~> 1.4)
     builder (3.2.3)
-    capybara (3.16.1)
+    capybara (3.30.0)
       addressable
       mini_mime (>= 0.1.3)
       nokogiri (~> 1.8)
       rack (>= 1.6.0)
       rack-test (>= 0.6.3)
-      regexp_parser (~> 1.2)
+      regexp_parser (~> 1.5)
       xpath (~> 3.2)
     climate_control (0.2.0)
     coderay (1.1.2)
@@ -727,7 +728,7 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2018.0812)
     mimemagic (0.3.2)
-    mini_mime (1.0.1)
+    mini_mime (1.0.2)
     mini_portile2 (2.4.0)
     minitest (5.11.3)
     momentjs-rails (2.7.0)
@@ -737,7 +738,7 @@ GEM
       bourbon (>= 3.1)
       sass (~> 3.2.19)
     newrelic_rpm (3.9.0.229)
-    nokogiri (1.10.3)
+    nokogiri (1.10.7)
       mini_portile2 (~> 2.4.0)
     normalize-rails (4.1.1)
     orm_adapter (0.5.0)
@@ -756,7 +757,8 @@ GEM
       slop (~> 3.4)
     pry-rails (0.3.2)
       pry (>= 0.9.10)
-    rack (1.6.11)
+    public_suffix (4.0.3)
+    rack (1.6.12)
     rack-test (0.6.3)
       rack (>= 1.0)
     rack-timeout (0.0.4)
@@ -798,7 +800,7 @@ GEM
     recipient_interceptor (0.1.2)
       mail
     redcarpet (3.4.0)
-    regexp_parser (1.4.0)
+    regexp_parser (1.6.0)
     responders (2.4.0)
       actionpack (>= 4.2.0, < 5.3)
       railties (>= 4.2.0, < 5.3)
@@ -905,7 +907,7 @@ DEPENDENCIES
   bitters
   bourbon
   brakeman
-  capybara (~> 3.16, >= 3.16.1)
+  capybara
   coffee-rails
   dalli
   database_cleaner

spec/spec_helper.rb

@@ -40,6 +40,8 @@ module Features
   config.include Paperclip::Shoulda::Matchers
   config.include ActionDispatch::TestProcess
 
+  config.expose_dsl_globally = true
+
   config.after(:each) do
     Apartment::Tenant.reset
     drop_schemas