From 9720063fb39d303a353db8fe626bf14b9bf5b6e5 Mon Sep 17 00:00:00 2001
From: Oleksii Kriuchykhin <okriuchykhin@biosistemika.com>
Date: Wed, 4 Apr 2018 15:29:20 +0200
Subject: [PATCH] Fix tests [SCI-2217]

---
 .travis.yml                                | 10 +++++++++-
 Makefile                                   |  5 ++++-
 app/assets/stylesheets/themes/scinote.scss |  2 +-
 config/environments/test.rb                |  3 +++
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9541c172c..f9aefdd68 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,16 @@
+env:
+  - DOCKER_COMPOSE_VERSION=1.13.0
+
 sudo: required
+language: ruby
 install: true
 services:
   - docker
-before_script:
+before_install:
+  - sudo rm /usr/local/bin/docker-compose
+  - curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose
+  - chmod +x docker-compose
+  - sudo mv docker-compose /usr/local/bin
   - make docker
 script:
   - make tests-ci
diff --git a/Makefile b/Makefile
index d6e4ce0ac..aaa7795ec 100644
--- a/Makefile
+++ b/Makefile
@@ -83,7 +83,10 @@ integration-tests:
 	@$(MAKE) rails cmd="bundle exec cucumber"
 
 tests-ci:
-	@docker-compose run -e ENABLE_EMAIL_CONFIRMATIONS=false -e MAILER_PORT=$MAILER_PORT -e SMTP_DOMAIN=$SMTP_DOMAIN -e SMTP_USERNAME=$SMTP_USERNAME -e SMTP_PASSWORD=$SMTP_PASSWORD -e SMTP_ADDRESS=$SMTP_ADDRESS -e PAPERCLIP_HASH_SECRET=PAPERCLIP_HASH_SECRET -e MAIL_SERVER_URL=localhost -e PAPERCLIP_STORAGE=filesystem -e ENABLE_TUTORIAL=false -e ENABLE_RECAPTCHA=false -e ENABLE_USER_CONFIRMATION=false -e ENABLE_USER_REGISTRATION=true --rm web bash -c "bundle install && rake db:create db:migrate && rake db:migrate RAILS_ENV=test && yarn install && bundle exec rspec && bundle exec cucumber"
+	@docker-compose run --rm web bash -c "bundle install && npm install"
+	@docker-compose up -d webpack
+	@docker-compose ps
+	@docker-compose run -e ENABLE_EMAIL_CONFIRMATIONS=false -e MAILER_PORT=$MAILER_PORT -e SMTP_DOMAIN=$SMTP_DOMAIN -e SMTP_USERNAME=$SMTP_USERNAME -e SMTP_PASSWORD=$SMTP_PASSWORD -e SMTP_ADDRESS=$SMTP_ADDRESS -e PAPERCLIP_HASH_SECRET=PAPERCLIP_HASH_SECRET -e MAIL_SERVER_URL=localhost -e PAPERCLIP_STORAGE=filesystem -e ENABLE_TUTORIAL=false -e ENABLE_RECAPTCHA=false -e ENABLE_USER_CONFIRMATION=false -e ENABLE_USER_REGISTRATION=true --rm web bash -c "rake db:create db:migrate && rake db:migrate RAILS_ENV=test && npm install && bundle exec rspec && bundle exec cucumber"
 
 console:
 	@$(MAKE) rails cmd="rails console"
diff --git a/app/assets/stylesheets/themes/scinote.scss b/app/assets/stylesheets/themes/scinote.scss
index 502fc7613..3dfc5f40a 100644
--- a/app/assets/stylesheets/themes/scinote.scss
+++ b/app/assets/stylesheets/themes/scinote.scss
@@ -1312,7 +1312,7 @@ table.dataTable {
   .file-preview-container {
     align-items: center;
     background-color: $color-white;
-    color: $color-dark-gray;
+    color: $gray-dark;
     display: -moz-flex;
     display: -webkit-flex;
     display: flex;
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 16ec7dc75..5653d750e 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -97,6 +97,9 @@ Rails.application.configure do
   # Enable user registrations
   config.x.enable_user_registration = true
 
+  # disable sign in with LinkedIn account
+  config.x.linkedin_signin_enabled = false
+
   # prevents compile assets
   config.assets.compile = false
 end