diff options
author | Robert Speicher <rspeicher@gmail.com> | 2015-05-06 16:50:47 -0400 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2015-05-28 18:22:32 -0400 |
commit | 05aa71ccd965d3c366d50231a6b1b29f05aba373 (patch) | |
tree | 54263a81f299927646e20a1f3b11a6b34b6dc703 /spec/javascripts | |
parent | 51888f746c8afe43c5fed90c8013a03788821099 (diff) | |
download | gitlab-ce-05aa71ccd965d3c366d50231a6b1b29f05aba373.tar.gz |
Remove jasmine-rails; add teaspoon
Diffstat (limited to 'spec/javascripts')
-rw-r--r-- | spec/javascripts/support/jasmine.yml | 15 | ||||
-rw-r--r-- | spec/javascripts/support/jasmine_helper.rb | 15 |
2 files changed, 0 insertions, 30 deletions
diff --git a/spec/javascripts/support/jasmine.yml b/spec/javascripts/support/jasmine.yml deleted file mode 100644 index 168c9618643..00000000000 --- a/spec/javascripts/support/jasmine.yml +++ /dev/null @@ -1,15 +0,0 @@ -# path to parent directory of spec_files -# relative path from Rails.root -# -# Alternatively accept an array of directory to include external spec files -# spec_dir: -# - spec/javascripts -# - ../engine/spec/javascripts -# -# defaults to spec/javascripts -spec_dir: spec/javascripts - -# list of file expressions to include as specs into spec runner -# relative path from spec_dir -spec_files: - - "**/*[Ss]pec.{js.coffee,js,coffee}" diff --git a/spec/javascripts/support/jasmine_helper.rb b/spec/javascripts/support/jasmine_helper.rb deleted file mode 100644 index 4d73aec5a31..00000000000 --- a/spec/javascripts/support/jasmine_helper.rb +++ /dev/null @@ -1,15 +0,0 @@ -#Use this file to set/override Jasmine configuration options -#You can remove it if you don't need it. -#This file is loaded *after* jasmine.yml is interpreted. -# -#Example: using a different boot file. -#Jasmine.configure do |config| -# config.boot_dir = '/absolute/path/to/boot_dir' -# config.boot_files = lambda { ['/absolute/path/to/boot_dir/file.js'] } -#end -# -#Example: prevent PhantomJS auto install, uses PhantomJS already on your path. -#Jasmine.configure do |config| -# config.prevent_phantom_js_auto_install = true -#end -# |