Removes unrelated changes with dashboard feature
This commit is contained in:
@@ -22,12 +22,10 @@ env:
|
|||||||
global:
|
global:
|
||||||
- KNAPSACK_PRO_FIXED_QUEUE_SPLIT=true
|
- KNAPSACK_PRO_FIXED_QUEUE_SPLIT=true
|
||||||
- KNAPSACK_PRO_LOG_LEVEL=info
|
- KNAPSACK_PRO_LOG_LEVEL=info
|
||||||
- KNAPSACK_PRO_CI_NODE_TOTAL=4
|
- KNAPSACK_PRO_CI_NODE_TOTAL=2
|
||||||
matrix:
|
matrix:
|
||||||
- KNAPSACK_PRO_CI_NODE_INDEX=0
|
- KNAPSACK_PRO_CI_NODE_INDEX=0
|
||||||
- KNAPSACK_PRO_CI_NODE_INDEX=1
|
- KNAPSACK_PRO_CI_NODE_INDEX=1
|
||||||
- KNAPSACK_PRO_CI_NODE_INDEX=2
|
|
||||||
- KNAPSACK_PRO_CI_NODE_INDEX=3
|
|
||||||
notifications:
|
notifications:
|
||||||
slack:
|
slack:
|
||||||
secure: 18E9SU0SR/9knRvCMYwVqFCqVTBT6qJtZQ/gadpheqUPPlcLoQfnlIzJkLIYqkE0sn1nkBE5Bt2I90FU53p0NkrTEmSGlQXcN1vEXM8EXMaoVf3NBsIJeleMwt9VTojzo81EgIi6x7q3fDiFORJ4rqOGd9XkeLn5yrAtIkdaenVs0bhS5s24FP76hKqO37IFLG2v3EEqxg5k31oW6yhyP35Mxns+AGbfaZbxEy4XbCoU65KFuYhBsVZ/y1evOl/wcre2fCAoT2uKeqUWGEcDzH7oSCz7vfk7iO9BZnO++v7oj8mr/nrZL1KMFt77eqtdT51XQoJcchgJC/R9km5hRGkQqFCHhqPcBxo5c3p+jauL0kLaqTggeLDv2FQ2huJ8FSJ4ADac+n3g7wT7BX7HJlCvK0nbooY1JtBlk7+6/pw6ksSFIOo0FHg5gXN9IlG1tQQuENzzsXULNc6s4nPeT+n78uOp1b0N/Gn06moEBaKgXqqx1yV1XeJ02X8n3uDZxPuX3n2bJ4DMIrBjeWApxHAgyOraOzQHNQgJoj4tHlWutF33ApV2tcIMefIzvjM4tIYwIkpfGgohGaTf8eU5X9pqiMgwlDpJHVBsSvpk/Z/Nj7evYznjBiDYqOcXoztsqHrS0C91MaT+eExDfd9HDmThsE07RT7zcP9aElFZA/k=
|
secure: 18E9SU0SR/9knRvCMYwVqFCqVTBT6qJtZQ/gadpheqUPPlcLoQfnlIzJkLIYqkE0sn1nkBE5Bt2I90FU53p0NkrTEmSGlQXcN1vEXM8EXMaoVf3NBsIJeleMwt9VTojzo81EgIi6x7q3fDiFORJ4rqOGd9XkeLn5yrAtIkdaenVs0bhS5s24FP76hKqO37IFLG2v3EEqxg5k31oW6yhyP35Mxns+AGbfaZbxEy4XbCoU65KFuYhBsVZ/y1evOl/wcre2fCAoT2uKeqUWGEcDzH7oSCz7vfk7iO9BZnO++v7oj8mr/nrZL1KMFt77eqtdT51XQoJcchgJC/R9km5hRGkQqFCHhqPcBxo5c3p+jauL0kLaqTggeLDv2FQ2huJ8FSJ4ADac+n3g7wT7BX7HJlCvK0nbooY1JtBlk7+6/pw6ksSFIOo0FHg5gXN9IlG1tQQuENzzsXULNc6s4nPeT+n78uOp1b0N/Gn06moEBaKgXqqx1yV1XeJ02X8n3uDZxPuX3n2bJ4DMIrBjeWApxHAgyOraOzQHNQgJoj4tHlWutF33ApV2tcIMefIzvjM4tIYwIkpfGgohGaTf8eU5X9pqiMgwlDpJHVBsSvpk/Z/Nj7evYznjBiDYqOcXoztsqHrS0C91MaT+eExDfd9HDmThsE07RT7zcP9aElFZA/k=
|
||||||
|
|||||||
1
Capfile
1
Capfile
@@ -10,6 +10,7 @@ require 'capistrano/rails/migrations'
|
|||||||
#require 'capistrano/passenger'
|
#require 'capistrano/passenger'
|
||||||
require 'capistrano/delayed_job'
|
require 'capistrano/delayed_job'
|
||||||
require 'whenever/capistrano'
|
require 'whenever/capistrano'
|
||||||
|
require 'rvm1/capistrano3'
|
||||||
|
|
||||||
#SCM: Git
|
#SCM: Git
|
||||||
require "capistrano/scm/git"
|
require "capistrano/scm/git"
|
||||||
|
|||||||
16
Dockerfile
16
Dockerfile
@@ -3,22 +3,6 @@ FROM ruby:2.3.6
|
|||||||
# Install essential Linux packages
|
# Install essential Linux packages
|
||||||
RUN apt-get update -qq && apt-get install -y build-essential libpq-dev postgresql-client nodejs imagemagick sudo
|
RUN apt-get update -qq && apt-get install -y build-essential libpq-dev postgresql-client nodejs imagemagick sudo
|
||||||
|
|
||||||
# Test requirements
|
|
||||||
RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - \
|
|
||||||
&& sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list' \
|
|
||||||
&& apt-get update \
|
|
||||||
&& apt-get install -y google-chrome-stable \
|
|
||||||
&& apt-get clean
|
|
||||||
|
|
||||||
RUN CHROMEDRIVER_RELEASE=2.36 \
|
|
||||||
&& CHROMEDRIVER_URL="http://chromedriver.storage.googleapis.com/$CHROMEDRIVER_RELEASE/chromedriver_linux64.zip" \
|
|
||||||
&& apt-get install unzip \
|
|
||||||
&& curl --silent --show-error --location --fail --retry 3 --output /tmp/chromedriver_linux64.zip $CHROMEDRIVER_URL \
|
|
||||||
&& unzip /tmp/chromedriver_linux64.zip chromedriver -d /usr/local/share \
|
|
||||||
&& chmod +x /usr/local/share/chromedriver \
|
|
||||||
&& ln -s /usr/local/share/chromedriver /usr/local/bin/chromedriver \
|
|
||||||
&& rm /tmp/chromedriver_linux64.zip
|
|
||||||
|
|
||||||
# Files created inside the container repect the ownership
|
# Files created inside the container repect the ownership
|
||||||
RUN adduser --shell /bin/bash --disabled-password --gecos "" consul \
|
RUN adduser --shell /bin/bash --disabled-password --gecos "" consul \
|
||||||
&& adduser consul sudo \
|
&& adduser consul sudo \
|
||||||
|
|||||||
1
Gemfile
1
Gemfile
@@ -79,7 +79,6 @@ end
|
|||||||
|
|
||||||
group :test do
|
group :test do
|
||||||
gem 'capybara', '~> 2.17.0'
|
gem 'capybara', '~> 2.17.0'
|
||||||
gem 'capybara-screenshot'
|
|
||||||
gem 'coveralls', '~> 0.8.21', require: false
|
gem 'coveralls', '~> 0.8.21', require: false
|
||||||
gem 'database_cleaner', '~> 1.6.1'
|
gem 'database_cleaner', '~> 1.6.1'
|
||||||
gem 'email_spec', '~> 2.1.0'
|
gem 'email_spec', '~> 2.1.0'
|
||||||
|
|||||||
@@ -99,9 +99,6 @@ GEM
|
|||||||
rack (>= 1.0.0)
|
rack (>= 1.0.0)
|
||||||
rack-test (>= 0.5.4)
|
rack-test (>= 0.5.4)
|
||||||
xpath (>= 2.0, < 4.0)
|
xpath (>= 2.0, < 4.0)
|
||||||
capybara-screenshot (1.0.21)
|
|
||||||
capybara (>= 1.0, < 4)
|
|
||||||
launchy
|
|
||||||
childprocess (0.8.0)
|
childprocess (0.8.0)
|
||||||
ffi (~> 1.0, >= 1.0.11)
|
ffi (~> 1.0, >= 1.0.11)
|
||||||
chronic (0.10.2)
|
chronic (0.10.2)
|
||||||
@@ -519,7 +516,6 @@ DEPENDENCIES
|
|||||||
capistrano-rails (~> 1.3.1)
|
capistrano-rails (~> 1.3.1)
|
||||||
capistrano3-delayed-job (~> 1.7.3)
|
capistrano3-delayed-job (~> 1.7.3)
|
||||||
capybara (~> 2.17.0)
|
capybara (~> 2.17.0)
|
||||||
capybara-screenshot
|
|
||||||
ckeditor (~> 4.2.3)
|
ckeditor (~> 4.2.3)
|
||||||
cocoon (~> 1.2.9)
|
cocoon (~> 1.2.9)
|
||||||
coffee-rails (~> 4.2.1)
|
coffee-rails (~> 4.2.1)
|
||||||
|
|||||||
@@ -1,8 +1,3 @@
|
|||||||
unless ENV['TRAVIS']
|
|
||||||
require 'simplecov'
|
|
||||||
SimpleCov.start 'rails'
|
|
||||||
end
|
|
||||||
|
|
||||||
ENV['RAILS_ENV'] ||= 'test'
|
ENV['RAILS_ENV'] ||= 'test'
|
||||||
if ENV['TRAVIS']
|
if ENV['TRAVIS']
|
||||||
require 'coveralls'
|
require 'coveralls'
|
||||||
@@ -16,7 +11,6 @@ require 'spec_helper'
|
|||||||
require 'capybara/rails'
|
require 'capybara/rails'
|
||||||
require 'capybara/rspec'
|
require 'capybara/rspec'
|
||||||
require 'selenium/webdriver'
|
require 'selenium/webdriver'
|
||||||
require 'capybara-screenshot/rspec'
|
|
||||||
|
|
||||||
I18n.default_locale = :en
|
I18n.default_locale = :en
|
||||||
|
|
||||||
@@ -48,14 +42,7 @@ Capybara.register_driver :headless_chrome do |app|
|
|||||||
)
|
)
|
||||||
end
|
end
|
||||||
|
|
||||||
Capybara::Screenshot.register_driver(:headless_chrome) do |driver, path|
|
|
||||||
driver.browser.save_screenshot(path)
|
|
||||||
end
|
|
||||||
|
|
||||||
Capybara.asset_host = 'http://localhost:3000'
|
|
||||||
Capybara::Screenshot.prune_strategy = :keep_last_run
|
|
||||||
Capybara.javascript_driver = :headless_chrome
|
Capybara.javascript_driver = :headless_chrome
|
||||||
Capybara.default_max_wait_time = 60
|
|
||||||
|
|
||||||
Capybara.exact = true
|
Capybara.exact = true
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user