From 60c7d35543af923f9c8b0a2c5872eb7cf1eb21dd Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Sun, 28 Jun 2015 16:27:40 -0400
Subject: [PATCH] Remove jasmine:ci task, execute teaspoon directly on CI

---
 .gitlab-ci.yml         |  4 ++--
 lib/tasks/jasmine.rake | 12 ------------
 2 files changed, 2 insertions(+), 14 deletions(-)
 delete mode 100644 lib/tasks/jasmine.rake

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