Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2015-04-18 21:01:14 +0300
committerRobert Speicher <rspeicher@gmail.com>2015-04-18 22:17:24 +0300
commite15af6943ad276e9d160f786b3d58a758280c942 (patch)
treec12590440a4e2420fc380caf5d8dca43d32893f0 /spec/javascripts
parent7679c500abb8f6dff4c49a7dec1b1643a4aedeb0 (diff)
Re-run rails g jasmine:install
Diffstat (limited to 'spec/javascripts')
-rw-r--r--spec/javascripts/support/jasmine.yml54
-rw-r--r--spec/javascripts/support/jasmine_helper.rb6
2 files changed, 56 insertions, 4 deletions
diff --git a/spec/javascripts/support/jasmine.yml b/spec/javascripts/support/jasmine.yml
index 9bfa261a356..a69c59b1837 100644
--- a/spec/javascripts/support/jasmine.yml
+++ b/spec/javascripts/support/jasmine.yml
@@ -25,7 +25,7 @@ src_files:
# - stylesheets/*.css
#
stylesheets:
- - stylesheets/**/*.css
+ - assets/application.css
# helpers
#
@@ -38,7 +38,7 @@ stylesheets:
# - helpers/**/*.js
#
helpers:
- - helpers/**/*.js
+ - 'helpers/**/*.js'
# spec_files
#
@@ -73,4 +73,52 @@ src_dir:
#
# spec_dir: spec/javascripts
#
-spec_dir: spec/javascripts
+spec_dir:
+
+# spec_helper
+#
+# Ruby file that Jasmine server will require before starting.
+# Returned relative to your root path
+# Default spec/javascripts/support/jasmine_helper.rb
+#
+# EXAMPLE:
+#
+# spec_helper: spec/javascripts/support/jasmine_helper.rb
+#
+spec_helper: spec/javascripts/support/jasmine_helper.rb
+
+# boot_dir
+#
+# Boot directory path. Your boot_files must be returned relative to this path.
+# Default: Built in boot file
+#
+# EXAMPLE:
+#
+# boot_dir: spec/javascripts/support/boot
+#
+boot_dir:
+
+# boot_files
+#
+# Return an array of filepaths relative to boot_dir to include in order to boot Jasmine
+# Default: Built in boot file
+#
+# EXAMPLE
+#
+# boot_files:
+# - '**/*.js'
+#
+boot_files:
+
+# rack_options
+#
+# Extra options to be passed to the rack server
+# by default, Port and AccessLog are passed.
+#
+# This is an advanced options, and left empty by default
+#
+# EXAMPLE
+#
+# rack_options:
+# server: 'thin'
+
diff --git a/spec/javascripts/support/jasmine_helper.rb b/spec/javascripts/support/jasmine_helper.rb
index b4919802afe..4d73aec5a31 100644
--- a/spec/javascripts/support/jasmine_helper.rb
+++ b/spec/javascripts/support/jasmine_helper.rb
@@ -8,4 +8,8 @@
# 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
+#