remove remaining vestiges of teaspoon test runner

10 files changed, 29 insertions, 228 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ebf165abf14..b8d2499f984 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -298,8 +298,7 @@ karma:
   <<: *dedicated-runner
   script:
     - npm link istanbul
-    - rake webpack:compile
-    - npm run karma-start
+    - rake karma
   artifacts:
     name: coverage-javascript
     expire_in: 31d
diff --git a/Gemfile b/Gemfile
index 27e415966df..0a5b4f5753c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -290,13 +290,9 @@ group :development, :test do
   gem 'capybara-screenshot', '~> 1.0.0'
   gem 'poltergeist',         '~> 1.9.0'
 
-  gem 'teaspoon', '~> 1.1.0'
-  gem 'teaspoon-jasmine', '~> 2.2.0'
-
   gem 'spring',                   '~> 1.7.0'
   gem 'spring-commands-rspec',    '~> 1.0.4'
   gem 'spring-commands-spinach',  '~> 1.1.0'
-  gem 'spring-commands-teaspoon', '~> 0.0.2'
 
   gem 'rubocop', '~> 0.43.0', require: false
   gem 'rubocop-rspec', '~> 1.5.0', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index b88f51a7a43..d02d35d638c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -697,8 +697,6 @@ GEM
       spring (>= 0.9.1)
     spring-commands-spinach (1.1.0)
       spring (>= 0.9.1)
-    spring-commands-teaspoon (0.0.2)
-      spring (>= 0.9.1)
     sprockets (3.7.0)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -722,10 +720,6 @@ GEM
     sys-filesystem (1.1.6)
       ffi
     sysexits (1.2.0)
-    teaspoon (1.1.5)
-      railties (>= 3.2.5, < 6)
-    teaspoon-jasmine (2.2.0)
-      teaspoon (>= 1.0.0)
     temple (0.7.7)
     test_after_commit (0.4.2)
       activerecord (>= 3.2)
@@ -958,14 +952,11 @@ DEPENDENCIES
   spring (~> 1.7.0)
   spring-commands-rspec (~> 1.0.4)
   spring-commands-spinach (~> 1.1.0)
-  spring-commands-teaspoon (~> 0.0.2)
   sprockets (~> 3.7.0)
   sprockets-es6 (~> 0.9.2)
   stackprof (~> 0.2.10)
   state_machines-activerecord (~> 0.4.0)
   sys-filesystem (~> 1.1.6)
-  teaspoon (~> 1.1.0)
-  teaspoon-jasmine (~> 2.2.0)
   test_after_commit (~> 0.4.2)
   thin (~> 1.7.0)
   timecop (~> 0.8.0)
diff --git a/bin/teaspoon b/bin/teaspoon
deleted file mode 100755
index 7c3b8dfc4ed..00000000000
--- a/bin/teaspoon
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env ruby
-begin
-  load File.expand_path('../spring', __FILE__)
-rescue LoadError => e
-  raise unless e.message.include?('spring')
-end
-require 'bundler/setup'
-load Gem.bin_path('teaspoon', 'teaspoon')
diff --git a/lib/tasks/gitlab/test.rake b/lib/tasks/gitlab/test.rake
index ec7aec1621c..84810b489ce 100644
--- a/lib/tasks/gitlab/test.rake
+++ b/lib/tasks/gitlab/test.rake
@@ -6,7 +6,7 @@ namespace :gitlab do
       %W(rake rubocop),
       %W(rake spinach),
       %W(rake spec),
-      %W(npm run karma-start)
+      %W(rake karma)
     ]
 
     cmds.each do |cmd|
diff --git a/lib/tasks/karma.rake b/lib/tasks/karma.rake
new file mode 100644
index 00000000000..89812a179ec
--- /dev/null
+++ b/lib/tasks/karma.rake
@@ -0,0 +1,25 @@
+unless Rails.env.production?
+  Rake::Task['karma'].clear if Rake::Task.task_defined?('karma')
+
+  namespace :karma do
+    desc 'GitLab | Karma | Generate fixtures for JavaScript tests'
+    RSpec::Core::RakeTask.new(:fixtures) do |t|
+      ENV['NO_KNAPSACK'] = 'true'
+      t.pattern = 'spec/javascripts/fixtures/*.rb'
+      t.rspec_opts = '--format documentation'
+    end
+
+    desc 'GitLab | Karma | Run JavaScript tests'
+    task :tests do
+      sh "npm run karma" do |ok, res|
+        abort('rake karma:tests failed') unless ok
+      end
+    end
+  end
+
+  desc 'GitLab | Karma | Shortcut for karma:fixtures and karma:tests'
+  task :karma do
+    Rake::Task['karma:fixtures'].invoke
+    Rake::Task['karma:tests'].invoke
+  end
+end
diff --git a/lib/tasks/teaspoon.rake b/lib/tasks/teaspoon.rake
deleted file mode 100644
index 08caedd7ff3..00000000000
--- a/lib/tasks/teaspoon.rake
+++ /dev/null
@@ -1,25 +0,0 @@
-unless Rails.env.production?
-  Rake::Task['teaspoon'].clear if Rake::Task.task_defined?('teaspoon')
-
-  namespace :teaspoon do
-    desc 'GitLab | Teaspoon | Generate fixtures for JavaScript tests'
-    RSpec::Core::RakeTask.new(:fixtures) do |t|
-      ENV['NO_KNAPSACK'] = 'true'
-      t.pattern = 'spec/javascripts/fixtures/*.rb'
-      t.rspec_opts = '--format documentation'
-    end
-
-    desc 'GitLab | Teaspoon | Run JavaScript tests'
-    task :tests do
-      require "teaspoon/console"
-      options = {}
-      abort('rake teaspoon:tests failed') if Teaspoon::Console.new(options).failures?
-    end
-  end
-
-  desc 'GitLab | Teaspoon | Shortcut for teaspoon:fixtures and teaspoon:tests'
-  task :teaspoon do
-    Rake::Task['teaspoon:fixtures'].invoke
-    Rake::Task['teaspoon:tests'].invoke
-  end
-end
diff --git a/lib/tasks/test.rake b/lib/tasks/test.rake
index 83f53e5454b..3e01f91d32c 100644
--- a/lib/tasks/test.rake
+++ b/lib/tasks/test.rake
@@ -7,5 +7,5 @@ end
 
 unless Rails.env.production?
   desc "GitLab | Run all tests on CI with simplecov"
-  task test_ci: [:rubocop, :brakeman, :'karma-start', :spinach, :spec]
+  task test_ci: [:rubocop, :brakeman, :karma, :spinach, :spec]
 end
diff --git a/package.json b/package.json
index ec012e9c3bd..ca767ebec9c 100644
--- a/package.json
+++ b/package.json
@@ -5,6 +5,7 @@
     "eslint": "eslint --max-warnings 0 --ext .js,.js.es6 .",
     "eslint-fix": "npm run eslint -- --fix",
     "eslint-report": "npm run eslint -- --format html --output-file ./eslint-report.html",
+    "karma": "karma start config/karma.config.js --single-run",
     "karma-start": "karma start config/karma.config.js"
   },
   "dependencies": {
diff --git a/spec/teaspoon_env.rb b/spec/teaspoon_env.rb
deleted file mode 100644
index 5ea020f313c..00000000000
--- a/spec/teaspoon_env.rb
+++ /dev/null
@@ -1,178 +0,0 @@
-Teaspoon.configure do |config|
-  # Determines where the Teaspoon routes will be mounted. Changing this to "/jasmine" would allow you to browse to
-  # `http://localhost:3000/jasmine` to run your tests.
-  config.mount_at = "/teaspoon"
-
-  # Specifies the root where Teaspoon will look for files. If you're testing an engine using a dummy application it can
-  # be useful to set this to your engines root (e.g. `Teaspoon::Engine.root`).
-  # Note: Defaults to `Rails.root` if nil.
-  config.root = nil
-
-  # Paths that will be appended to the Rails assets paths
-  # Note: Relative to `config.root`.
-  config.asset_paths = ["spec/javascripts", "spec/javascripts/stylesheets"]
-
-  # Fixtures are rendered through a controller, which allows using HAML, RABL/JBuilder, etc. Files in these paths will
-  # be rendered as fixtures.
-  config.fixture_paths = ["spec/javascripts/fixtures"]
-
-  # SUITES
-  #
-  # You can modify the default suite configuration and create new suites here. Suites are isolated from one another.
-  #
-  # When defining a suite you can provide a name and a block. If the name is left blank, :default is assumed. You can
-  # omit various directives and the ones defined in the default suite will be used.
-  #
-  # To run a specific suite
-  # - in the browser: http://localhost/teaspoon/[suite_name]
-  # - with the rake task: rake teaspoon suite=[suite_name]
-  # - with the cli: teaspoon --suite=[suite_name]
-  config.suite do |suite|
-    # Specify the framework you would like to use. This allows you to select versions, and will do some basic setup for
-    # you -- which you can override with the directives below. This should be specified first, as it can override other
-    # directives.
-    # Note: If no version is specified, the latest is assumed.
-    #
-    # Versions: 1.3.1, 2.0.3, 2.1.3, 2.2.0
-    suite.use_framework :jasmine, "2.2.0"
-
-    # Specify a file matcher as a regular expression and all matching files will be loaded when the suite is run. These
-    # files need to be within an asset path. You can add asset paths using the `config.asset_paths`.
-    suite.matcher = "{spec/javascripts,app/assets}/**/*_spec.{js,js.es6,es6}"
-
-    # Load additional JS files, but requiring them in your spec helper is the preferred way to do this.
-    # suite.javascripts = []
-
-    # You can include your own stylesheets if you want to change how Teaspoon looks.
-    # Note: Spec related CSS can and should be loaded using fixtures.
-    # suite.stylesheets = ["teaspoon"]
-
-    # This suites spec helper, which can require additional support files. This file is loaded before any of your test
-    # files are loaded.
-    suite.helper = "spec_helper"
-
-    # Partial to be rendered in the head tag of the runner. You can use the provided ones or define your own by creating
-    # a `_boot.html.erb` in your fixtures path, and adjust the config to `"/boot"` for instance.
-    #
-    # Available: boot, boot_require_js
-    suite.boot_partial = "boot"
-
-    # Partial to be rendered in the body tag of the runner. You can define your own to create a custom body structure.
-    suite.body_partial = "body"
-
-    # Hooks allow you to use `Teaspoon.hook("fixtures")` before, after, or during your spec run. This will make a
-    # synchronous Ajax request to the server that will call all of the blocks you've defined for that hook name.
-    # suite.hook :fixtures, &proc{}
-
-    # Determine whether specs loaded into the test harness should be embedded as individual script tags or concatenated
-    # into a single file. Similar to Rails' asset `debug: true` and `config.assets.debug = true` options. By default,
-    # Teaspoon expands all assets to provide more valuable stack traces that reference individual source files.
-    # suite.expand_assets = true
-  end
-
-  # Example suite. Since we're just filtering to files already within the root test/javascripts, these files will also
-  # be run in the default suite -- but can be focused into a more specific suite.
-  # config.suite :targeted do |suite|
-  #  suite.matcher = "spec/javascripts/targeted/*_spec.{js,js.coffee,coffee}"
-  # end
-
-  # CONSOLE RUNNER SPECIFIC
-  #
-  # These configuration directives are applicable only when running via the rake task or command line interface. These
-  # directives can be overridden using the command line interface arguments or with ENV variables when using the rake
-  # task.
-  #
-  # Command Line Interface:
-  # teaspoon --driver=phantomjs --server-port=31337 --fail-fast=true --format=junit --suite=my_suite /spec/file_spec.js
-  #
-  # Rake:
-  # teaspoon DRIVER=phantomjs SERVER_PORT=31337 FAIL_FAST=true FORMATTERS=junit suite=my_suite
-
-  # Specify which headless driver to use. Supports PhantomJS and Selenium Webdriver.
-  #
-  # Available: :phantomjs, :selenium, :capybara_webkit
-  # PhantomJS: https://github.com/modeset/teaspoon/wiki/Using-PhantomJS
-  # Selenium Webdriver: https://github.com/modeset/teaspoon/wiki/Using-Selenium-WebDriver
-  # Capybara Webkit: https://github.com/modeset/teaspoon/wiki/Using-Capybara-Webkit
-  # config.driver = :phantomjs
-
-  # Specify additional options for the driver.
-  #
-  # PhantomJS: https://github.com/modeset/teaspoon/wiki/Using-PhantomJS
-  # Selenium Webdriver: https://github.com/modeset/teaspoon/wiki/Using-Selenium-WebDriver
-  # Capybara Webkit: https://github.com/modeset/teaspoon/wiki/Using-Capybara-Webkit
-  # config.driver_options = nil
-
-  # Specify the timeout for the driver. Specs are expected to complete within this time frame or the run will be
-  # considered a failure. This is to avoid issues that can arise where tests stall.
-  # config.driver_timeout = 180
-
-  # Specify a server to use with Rack (e.g. thin, mongrel). If nil is provided Rack::Server is used.
-  # config.server = nil
-
-  # Specify a port to run on a specific port, otherwise Teaspoon will use a random available port.
-  # config.server_port = nil
-
-  # Timeout for starting the server in seconds. If your server is slow to start you may have to bump this, or you may
-  # want to lower this if you know it shouldn't take long to start.
-  # config.server_timeout = 20
-
-  # Force Teaspoon to fail immediately after a failing suite. Can be useful to make Teaspoon fail early if you have
-  # several suites, but in environments like CI this may not be desirable.
-  # config.fail_fast = true
-
-  # Specify the formatters to use when outputting the results.
-  # Note: Output files can be specified by using `"junit>/path/to/output.xml"`.
-  #
-  # Available: :dot, :clean, :documentation, :json, :junit, :pride, :rspec_html, :snowday, :swayze_or_oprah, :tap, :tap_y, :teamcity
-  # config.formatters = [:dot]
-
-  # Specify if you want color output from the formatters.
-  # config.color = true
-
-  # Teaspoon pipes all console[log/debug/error] to $stdout. This is useful to catch places where you've forgotten to
-  # remove them, but in verbose applications this may not be desirable.
-  # config.suppress_log = false
-
-  # COVERAGE REPORTS / THRESHOLD ASSERTIONS
-  #
-  # Coverage reports requires Istanbul (https://github.com/gotwarlost/istanbul) to add instrumentation to your code and
-  # display coverage statistics.
-  #
-  # Coverage configurations are similar to suites. You can define several, and use different ones under different
-  # conditions.
-  #
-  # To run with a specific coverage configuration
-  # - with the rake task: rake teaspoon USE_COVERAGE=[coverage_name]
-  # - with the cli: teaspoon --coverage=[coverage_name]
-
-  # Specify that you always want a coverage configuration to be used. Otherwise, specify that you want coverage
-  # on the CLI.
-  # Set this to "true" or the name of your coverage config.
-  config.use_coverage = true
-
-  # You can have multiple coverage configs by passing a name to config.coverage.
-  # e.g. config.coverage :ci do |coverage|
-  # The default coverage config name is :default.
-  config.coverage do |coverage|
-    # Which coverage reports Istanbul should generate. Correlates directly to what Istanbul supports.
-    #
-    # Available: text-summary, text, html, lcov, lcovonly, cobertura, teamcity
-    coverage.reports = ["text-summary", "html"]
-
-    # The path that the coverage should be written to - when there's an artifact to write to disk.
-    # Note: Relative to `config.root`.
-    coverage.output_path = "coverage-javascript"
-
-    # Assets to be ignored when generating coverage reports. Accepts an array of filenames or regular expressions. The
-    # default excludes assets from vendor, gems and support libraries.
-    coverage.ignore = [%r{vendor/}, %r{spec/}]
-
-    # Various thresholds requirements can be defined, and those thresholds will be checked at the end of a run. If any
-    # aren't met the run will fail with a message. Thresholds can be defined as a percentage (0-100), or nil.
-    # coverage.statements = nil
-    # coverage.functions = nil
-    # coverage.branches = nil
-    # coverage.lines = nil
-  end
-end