Merge branch 'rs-update-gitlab-ci' into 'master'

.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

lib/tasks/jasmine.rake

-# 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