diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2015-06-28 16:27:40 -0400 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2015-06-28 16:27:40 -0400 |
| commit | 60c7d35543af923f9c8b0a2c5872eb7cf1eb21dd (patch) | |
| tree | 125fa32dc14392fa8b8679bbe78370d8f9f8f119 | |
| parent | 9f166a864959370d3e31931519506887b902cd11 (diff) | |
| download | gitlab-ce-rs-update-gitlab-ci.tar.gz | |
Remove jasmine:ci task, execute teaspoon directly on CIrs-update-gitlab-ci
| -rw-r--r-- | .gitlab-ci.yml | 4 | ||||
| -rw-r--r-- | lib/tasks/jasmine.rake | 12 |
2 files changed, 2 insertions, 14 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5524c9a7fcb..ddf4e31204a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -45,9 +45,9 @@ spinach:other: - ruby - mysql -jasmine:ci: +teaspoon: script: - - RAILS_ENV=test SIMPLECOV=true bundle exec rake jasmine:ci + - RAILS_ENV=test bundle exec teaspoon tags: - ruby - mysql diff --git a/lib/tasks/jasmine.rake b/lib/tasks/jasmine.rake deleted file mode 100644 index ac307a9e929..00000000000 --- a/lib/tasks/jasmine.rake +++ /dev/null @@ -1,12 +0,0 @@ -# Since we no longer explicitly require the 'jasmine' gem, we lost the -# `jasmine:ci` task used by GitLab CI jobs. -# -# This provides a simple alias to run the `spec:javascript` task from the -# 'jasmine-rails' gem. -task jasmine: ['jasmine:ci'] - -namespace :jasmine do - task :ci do - Rake::Task['teaspoon'].invoke - end -end |