summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml15
1 files changed, 8 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index deb5345d3bd..e2141716311 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -107,11 +107,13 @@ setup-test-env:
<<: *dedicated-runner
stage: prepare
script:
- - bundle exec rake gitlab:assets:compile 2>/dev/null
+ - npm install
+ - bundle exec rake gitlab:assets:compile
- bundle exec ruby -Ispec -e 'require "spec_helper" ; TestEnv.init'
artifacts:
expire_in: 7d
paths:
+ - node_modules
- public/assets
- tmp/tests
@@ -232,7 +234,7 @@ spinach 9 10 ruby21: *spinach-knapsack-ruby21
script:
- bundle exec $CI_BUILD_NAME
-rubocop:
+rubocop:
<<: *ruby-static-analysis
<<: *dedicated-runner
stage: test
@@ -291,18 +293,17 @@ rake db:seed_fu:
paths:
- log/development.log
-teaspoon:
+karma:
cache:
paths:
- vendor/ruby
- - node_modules/
+ - node_modules
stage: test
<<: *use-db
<<: *dedicated-runner
script:
- - npm install
- npm link istanbul
- - bundle exec rake teaspoon
+ - bundle exec rake karma
artifacts:
name: coverage-javascript
expire_in: 31d
@@ -444,7 +445,7 @@ pages:
<<: *dedicated-runner
dependencies:
- coverage
- - teaspoon
+ - karma
- lint:javascript:report
script:
- mv public/ .public/