scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-09-05 20:54:27 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix tests [SCI-2217]

Browse source
This commit is contained in:
Oleksii Kriuchykhin 2018-04-04 15:29:20 +02:00
parent 3b7977ee3b
commit 9720063fb3
4 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
.travis.yml
View file

@ -1,8 +1,16 @@
env:
- DOCKER_COMPOSE_VERSION=1.13.0
sudo: required sudo: required
language: ruby
install: true install: true
services: services:
- docker - 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 - make docker
script: script:
- make tests-ci - make tests-ci

5
Makefile
View file

@ -83,7 +83,10 @@ integration-tests:
@$(MAKE) rails cmd="bundle exec cucumber" @$(MAKE) rails cmd="bundle exec cucumber"
tests-ci: 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: console:
@$(MAKE) rails cmd="rails console" @$(MAKE) rails cmd="rails console"

2
app/assets/stylesheets/themes/scinote.scss
View file

@ -1312,7 +1312,7 @@ table.dataTable {
.file-preview-container { .file-preview-container {
align-items: center; align-items: center;
background-color: $color-white; background-color: $color-white;
color: $color-dark-gray; color: $gray-dark;
display: -moz-flex; display: -moz-flex;
display: -webkit-flex; display: -webkit-flex;
display: flex; display: flex;

3
config/environments/test.rb
View file

@ -97,6 +97,9 @@ Rails.application.configure do
# Enable user registrations # Enable user registrations
config.x.enable_user_registration = true config.x.enable_user_registration = true
# disable sign in with LinkedIn account
config.x.linkedin_signin_enabled = false
# prevents compile assets # prevents compile assets
config.assets.compile = false config.assets.compile = false
end end