diff --git a/.travis.yml b/.travis.yml index 8cf635e54c..18dd0dc002 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,17 +33,18 @@ language: ruby rvm: - - 2.2.3 + - 2.2.5 sudo: false cache: - - bundler: true - - directories: + bundler: true + directories: - frontend/node_modules - frontend/bower_components -bundler_args: --without development production + +bundler_args: --without development production docker branches: only: @@ -58,22 +59,20 @@ env: - COVERAGE=true matrix: - - "TEST_SUITE=plugins:spec DB=mysql" - - "TEST_SUITE=plugins:cucumber DB=mysql" + - "TEST_SUITE=plugins:spec DB=mysql GROUP_SIZE=1 GROUP=1" + - "TEST_SUITE=plugins:cucumber DB=mysql GROUP_SIZE=1 GROUP=1" - "TEST_SUITE=npm" - - "TEST_SUITE=spec_legacy DB=mysql GROUP_SIZE=2 GROUP=1" - - "TEST_SUITE=spec_legacy DB=mysql GROUP_SIZE=2 GROUP=2" - - "TEST_SUITE=cucumber DB=mysql GROUP_SIZE=3 GROUP=1" - - "TEST_SUITE=cucumber DB=mysql GROUP_SIZE=3 GROUP=2" - - "TEST_SUITE=cucumber DB=mysql GROUP_SIZE=3 GROUP=3" - - "TEST_SUITE=rspec DB=mysql GROUP_SIZE=6 GROUP=1" - - "TEST_SUITE=rspec DB=mysql GROUP_SIZE=6 GROUP=2" - - "TEST_SUITE=rspec DB=mysql GROUP_SIZE=6 GROUP=3" - - "TEST_SUITE=rspec DB=mysql GROUP_SIZE=6 GROUP=4" - - "TEST_SUITE=rspec DB=mysql GROUP_SIZE=6 GROUP=5" - - "TEST_SUITE=rspec DB=mysql GROUP_SIZE=6 GROUP=6" + - "TEST_SUITE=spec_legacy DB=mysql" + - "TEST_SUITE=cucumber DB=mysql GROUP_SIZE=2 GROUP=1" + - "TEST_SUITE=cucumber DB=mysql GROUP_SIZE=2 GROUP=2" + - "TEST_SUITE=specs DB=mysql GROUP_SIZE=3 GROUP=1" + - "TEST_SUITE=specs DB=mysql GROUP_SIZE=3 GROUP=2" + - "TEST_SUITE=specs DB=mysql GROUP_SIZE=3 GROUP=3" + - "TEST_SUITE=features DB=mysql GROUP_SIZE=3 GROUP=1" + - "TEST_SUITE=features DB=mysql GROUP_SIZE=3 GROUP=2" + - "TEST_SUITE=features DB=mysql GROUP_SIZE=3 GROUP=3" before_install: # Custom plugin instructions follow. @@ -98,6 +97,11 @@ before_install: - "export DISPLAY=:99.0" - "/sbin/start-stop-daemon --start -v --pidfile ./tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1920x1080x16" - "echo `xdpyinfo -display :99 | grep 'dimensions' | awk '{ print $2 }'`" + # Install Node LTS Boron (6.9.1) + - nvm install 6.9.1 + # We need npm 4.0 for a bugfix in cross-platform shrinkwrap + # https://github.com/npm/npm/issues/14042 + - npm install npm@4.0 - travis_retry npm install # We need phantomjs 2.0 to get tests passing @@ -110,7 +114,7 @@ before_script: - sh script/ci_setup.sh $DB script: - - sh script/ci_runner.sh $TEST_SUITE $GROUP_SIZE $GROUP + - sh script/ci_runner.sh addons: firefox: "45.0esr" diff --git a/app/controllers/export_card_configurations_controller.rb b/app/controllers/export_card_configurations_controller.rb index aca62d04c9..be88a95cdd 100644 --- a/app/controllers/export_card_configurations_controller.rb +++ b/app/controllers/export_card_configurations_controller.rb @@ -110,4 +110,14 @@ class ExportCardConfigurationsController < ApplicationController def load_configs @configs = ExportCardConfiguration.all end + + protected + + def default_breadcrumb + if action_name == 'index' + t('label_export_card_configuration') + else + ActionController::Base.helpers.link_to(t('label_export_card_configuration'), pdf_export_export_card_configurations_path) + end + end end