Make rake jasmine:ci run specs correctly.
- Will replace rake core_specs. - Remove obsolete dependencies & files -- most of these were for build tasks we are no longer using. Notably, rspec and spec_helper were deleted.
This commit is contained in:
@@ -1,6 +1,6 @@
|
|||||||
source 'https://rubygems.org'
|
source 'https://rubygems.org'
|
||||||
gem "jasmine", :git => 'https://github.com/pivotal/jasmine-gem.git'
|
gem "jasmine", :git => 'https://github.com/pivotal/jasmine-gem.git'
|
||||||
#gem "jasmine", path: "/Users/pivotal/workspace/jasmine-gem"
|
# gem "jasmine", path: "/Users/pivotal/workspace/jasmine-gem"
|
||||||
unless ENV["TRAVIS"]
|
unless ENV["TRAVIS"]
|
||||||
group :debug do
|
group :debug do
|
||||||
gem 'debugger'
|
gem 'debugger'
|
||||||
@@ -8,3 +8,5 @@ unless ENV["TRAVIS"]
|
|||||||
end
|
end
|
||||||
|
|
||||||
gemspec
|
gemspec
|
||||||
|
|
||||||
|
gem "jasmine_selenium_runner", :git => 'https://github.com/jasmine/jasmine_selenium_runner.git'
|
||||||
|
|||||||
@@ -2,10 +2,7 @@ require "bundler"
|
|||||||
Bundler::GemHelper.install_tasks
|
Bundler::GemHelper.install_tasks
|
||||||
require "json"
|
require "json"
|
||||||
require "jasmine"
|
require "jasmine"
|
||||||
|
load "jasmine/tasks/jasmine.rake"
|
||||||
Dir["#{File.dirname(__FILE__)}/tasks/**/*.rb"].each do |file|
|
|
||||||
require file
|
|
||||||
end
|
|
||||||
|
|
||||||
# TODO: Is there better way to invoke this using Jasmine gem???
|
# TODO: Is there better way to invoke this using Jasmine gem???
|
||||||
desc "Run jasmine core specs in a browser."
|
desc "Run jasmine core specs in a browser."
|
||||||
@@ -14,28 +11,3 @@ task :core_spec do
|
|||||||
end
|
end
|
||||||
task :default => :core_spec
|
task :default => :core_spec
|
||||||
|
|
||||||
namespace :jasmine do
|
|
||||||
task :server do
|
|
||||||
port = ENV['JASMINE_PORT'] || 8888
|
|
||||||
jasmine_yml = ENV['JASMINE_YML'] || 'jasmine.yml'
|
|
||||||
Jasmine.load_configuration_from_yaml(File.join(Dir.pwd, 'spec', jasmine_yml))
|
|
||||||
config = Jasmine.config
|
|
||||||
server = Jasmine::Server.new(port, Jasmine::Application.app(config))
|
|
||||||
server.start
|
|
||||||
|
|
||||||
puts "your tests are here:"
|
|
||||||
puts " http://localhost:#{port}/"
|
|
||||||
end
|
|
||||||
|
|
||||||
desc "Copy examples from Jasmine JS to the gem"
|
|
||||||
task :copy_examples_to_gem do
|
|
||||||
require "fileutils"
|
|
||||||
|
|
||||||
# copy jasmine's example tree into our generator templates dir
|
|
||||||
FileUtils.rm_r('generators/jasmine/templates/jasmine-example', :force => true)
|
|
||||||
FileUtils.cp_r(File.join(Jasmine::Core.path, 'example'), 'generators/jasmine/templates/jasmine-example', :preserve => true)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
desc "Run specs via server"
|
|
||||||
task :jasmine => ['jasmine:server']
|
|
||||||
|
|||||||
@@ -16,13 +16,7 @@ Gem::Specification.new do |s|
|
|||||||
|
|
||||||
s.files = Dir.glob("./lib/**/*") + Dir.glob("./lib/jasmine-core/spec/**/*.js")
|
s.files = Dir.glob("./lib/**/*") + Dir.glob("./lib/jasmine-core/spec/**/*.js")
|
||||||
s.require_paths = ["lib"]
|
s.require_paths = ["lib"]
|
||||||
s.add_development_dependency "json_pure", ">= 1.4.3"
|
|
||||||
s.add_development_dependency "sass"
|
|
||||||
s.add_development_dependency "compass"
|
|
||||||
s.add_development_dependency "rspec"
|
|
||||||
s.add_development_dependency "rake"
|
s.add_development_dependency "rake"
|
||||||
s.add_development_dependency "fuubar"
|
|
||||||
s.add_development_dependency "awesome_print"
|
|
||||||
s.add_development_dependency "nokogiri"
|
|
||||||
s.add_development_dependency "sauce-connect"
|
s.add_development_dependency "sauce-connect"
|
||||||
|
s.add_development_dependency "jasmine_selenium_runner"
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ require 'rubygems'
|
|||||||
require 'bundler/setup'
|
require 'bundler/setup'
|
||||||
require 'jasmine'
|
require 'jasmine'
|
||||||
|
|
||||||
Jasmine.load_configuration_from_yaml(File.join(Dir.pwd, 'spec', 'jasmine.yml'))
|
Jasmine.load_configuration_from_yaml(File.join(Dir.pwd, 'spec', 'javascripts', 'support', 'jasmine.yml'))
|
||||||
config = Jasmine.config
|
config = Jasmine.config
|
||||||
|
|
||||||
browser = ENV['JASMINE_BROWSER'] || 'firefox'
|
browser = ENV['JASMINE_BROWSER'] || 'firefox'
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ src_dir:
|
|||||||
- 'src'
|
- 'src'
|
||||||
src_files:
|
src_files:
|
||||||
- '**/*.js'
|
- '**/*.js'
|
||||||
boot_dir: 'spec/support'
|
boot_dir: 'spec/javascripts/support'
|
||||||
boot_files:
|
boot_files:
|
||||||
- 'dev_boot.js'
|
- 'dev_boot.js'
|
||||||
helpers:
|
helpers:
|
||||||
@@ -10,6 +10,5 @@ helpers:
|
|||||||
spec_files:
|
spec_files:
|
||||||
- 'performance/performance_test.js'
|
- 'performance/performance_test.js'
|
||||||
spec_dir:
|
spec_dir:
|
||||||
- 'spec'
|
|
||||||
|
|
||||||
|
|
||||||
@@ -15,7 +15,7 @@ src_files:
|
|||||||
- 'html/**.js'
|
- 'html/**.js'
|
||||||
- '**/*.js'
|
- '**/*.js'
|
||||||
stylesheets:
|
stylesheets:
|
||||||
boot_dir: 'spec/support'
|
boot_dir: 'spec/javascripts/support'
|
||||||
boot_files:
|
boot_files:
|
||||||
- 'dev_boot.js'
|
- 'dev_boot.js'
|
||||||
helpers:
|
helpers:
|
||||||
@@ -23,6 +23,5 @@ helpers:
|
|||||||
spec_files:
|
spec_files:
|
||||||
- '**/*[Ss]pec.js'
|
- '**/*[Ss]pec.js'
|
||||||
spec_dir:
|
spec_dir:
|
||||||
- 'spec'
|
|
||||||
|
|
||||||
|
|
||||||
+3
-3
@@ -169,10 +169,10 @@ process.argv.forEach(function(arg) {
|
|||||||
specs = [];
|
specs = [];
|
||||||
|
|
||||||
if (perfSuite) {
|
if (perfSuite) {
|
||||||
specs = getFiles(__dirname + '/performance', new RegExp("test.js$"));
|
specs = getFiles(__dirname + '/javascripts/performance', new RegExp("test.js$"));
|
||||||
} else {
|
} else {
|
||||||
var consoleSpecs = getSpecFiles(__dirname + "/console"),
|
var consoleSpecs = getSpecFiles(__dirname + "/javascripts/console"),
|
||||||
coreSpecs = getSpecFiles(__dirname + "/core"),
|
coreSpecs = getSpecFiles(__dirname + "/javascripts/core"),
|
||||||
specs = consoleSpecs.concat(coreSpecs);
|
specs = consoleSpecs.concat(coreSpecs);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,49 +0,0 @@
|
|||||||
# This file was generated by the `rspec --init` command. Conventionally, all
|
|
||||||
# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
|
|
||||||
# Require this file using `require "spec_helper.rb"` to ensure that it is only
|
|
||||||
# loaded once.
|
|
||||||
#
|
|
||||||
# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
|
|
||||||
RSpec.configure do |config|
|
|
||||||
config.treat_symbols_as_metadata_keys_with_true_values = true
|
|
||||||
config.run_all_when_everything_filtered = true
|
|
||||||
config.filter_run :focus
|
|
||||||
end
|
|
||||||
|
|
||||||
require 'awesome_print'
|
|
||||||
require 'tmpdir'
|
|
||||||
require 'nokogiri'
|
|
||||||
|
|
||||||
def project_root
|
|
||||||
File.join(File.expand_path(File.dirname(__FILE__)), '..')
|
|
||||||
end
|
|
||||||
|
|
||||||
def capture_output(capture = true)
|
|
||||||
if capture
|
|
||||||
output = StringIO.new
|
|
||||||
$stdout = output
|
|
||||||
end
|
|
||||||
yield
|
|
||||||
if capture
|
|
||||||
output.string
|
|
||||||
end
|
|
||||||
ensure
|
|
||||||
$stdout = STDOUT
|
|
||||||
end
|
|
||||||
|
|
||||||
def reset_dir(dir)
|
|
||||||
FileUtils.rm_r dir if File.exists?(dir)
|
|
||||||
FileUtils.mkdir_p dir
|
|
||||||
end
|
|
||||||
|
|
||||||
def jasmine_version
|
|
||||||
version = jasmine_version_object
|
|
||||||
|
|
||||||
version_string = "#{version['major']}.#{version['minor']}.#{version['build']}"
|
|
||||||
version_string += ".rc#{version['release_candidate']}" if version['release_candidate']
|
|
||||||
version_string
|
|
||||||
end
|
|
||||||
|
|
||||||
def jasmine_version_object
|
|
||||||
@version_object ||= JSON.parse(File.read(File.join(JasmineDev.project_root, 'src', 'version.json')))
|
|
||||||
end
|
|
||||||
Reference in New Issue
Block a user