github-migration/jasmine-headless-webkit
1
0
Fork 0
Code Issues 39 Pull Requests 16 Packages Projects Releases Wiki Activity

rearrange the furniture some more

Browse Source
This commit is contained in:
John Bintz 2011-10-26 08:45:23 -04:00
parent 298e8c2d3d
commit 69d865c050
17 changed files with 39 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Guardfile
View File

@ -3,6 +3,8 @@
# watch('file/path') { `command(s)` }
#
guard 'coffeescript', :input => 'vendor/assets/coffeescripts', :output => 'vendor/assets/javascripts'
guard 'shell' do
watch(%r{ext/jasmine-webkit-specrunner/.*\.(cpp|h|pro|pri)}) { |m|
if !m[0]['moc_']
@ -32,4 +34,3 @@ end
compile
guard 'coffeescript', :input => 'jasmine'

49
lib/jasmine/files_list.rb
View File

@ -6,17 +6,30 @@ module Jasmine
class FilesList
attr_reader :files, :spec_files, :filtered_files, :spec_outside_scope
class << self
def find_vendored_asset_paths(*names)
require 'rubygems'
raise StandardError.new("A newer version of Rubygems is required to use vendored assets. Please upgrade.") if !Gem::Specification.respond_to?(:map)
all_spec_files.find_all do |file|
names.any? { |name| file["/#{name}.js"] }
end
end
def all_spec_files
@all_spec_files ||= Gem::Specification.map { |spec| spec.files.find_all { |file|
file["vendor/assets/javascripts"]
}.compact.collect { |file| File.join(spec.gem_dir, file) } }.flatten
end
end
DEFAULT_FILES = [
File.join(Jasmine::Core.path, "jasmine.js"),
File.join(Jasmine::Core.path, "jasmine-html.js"),
File.join(Jasmine::Core.path, "jasmine.css"),
Jasmine::Headless.root.join('jasmine/jasmine-extensions.js').to_s,
Jasmine::Headless.root.join('jasmine/intense.js').to_s,
Jasmine::Headless.root.join('jasmine/headless_reporter_result.js').to_s,
Jasmine::Headless.root.join('jasmine/jasmine.headless-reporter.js').to_s,
Jasmine::Headless.root.join('js-lib/jsDump.js').to_s,
Jasmine::Headless.root.join('js-lib/beautify-html.js').to_s
]
File.join(Jasmine::Core.path, "jasmine.css")
] + %w{jasmine-extensions intense headless_reporter_result jasmine.headless-reporter jsDump beautify-html}.collect { |name|
Jasmine::Headless.root.join("vendor/assets/javascripts/#{name}.js").to_s
}
PLEASE_WAIT_IM_WORKING_TIME = 2
@ -75,13 +88,10 @@ module Jasmine
cache = Jasmine::Headless::CoffeeScriptCache.new(file)
source = cache.handle
if cache.cached?
%{
<script type="text/javascript" src="#{cache.cache_file}"></script>S
%{<script type="text/javascript" src="#{cache.cache_file}"></script>
<script type="text/javascript">
window.CoffeeScriptToFilename = window.CoffeeScriptToFilename || {};
window.CoffeeScriptToFilename['#{File.split(cache.cache_file).last}'] = '#{file}';
</script>
}
</script>}
else
%{<script type="text/javascript">#{source}</script>}
end
@ -161,19 +171,6 @@ module Jasmine
def expanded_dir(path)
Dir[path].collect { |file| File.expand_path(file) }
end
def self.find_vendored_asset_path(name)
require 'rubygems'
raise StandardError.new("A newer version of Rubygems is required to use vendored assets. Please upgrade.") if !Gem::Specification.respond_to?(:map)
all_spec_files.find_all { |file| file["vendor/assets/javascripts/#{name}.js"] }
end
def self.all_spec_files
@all_spec_files ||= Gem::Specification.map { |spec| spec.files.find_all { |file|
file["vendor/assets/javascripts"]
}.compact.collect { |file| File.join(spec.gem_dir, file) } }.flatten
end
end
end

2
skel/template.html.erb
View File

@ -3,7 +3,7 @@
<head>
<meta content="text/html;charset=UTF-8" http-equiv="Content-Type"/>
<title>Jasmine Test Runner - Generated by jasmine-headless-webkit</title>
<script type="text/javascript" src="<%= Jasmine::Headless.root.join('jasmine/prolog.js') %>"</script>
<script type="text/javascript" src="<%= Jasmine::Headless.root.join('vendor/assets/javascripts/prolog.js') %>"</script>
<%= files.join("\n") %>
<script type="text/javascript">
if (window.JHW) { HeadlessReporterResult.specLineNumbers = <%= MultiJson.encode(spec_lines) %>; }

2
spec/javascripts/support/jasmine.yml
View File

@ -1,4 +1,4 @@
src_files: [ 'jasmine/*.coffee' ]
src_files: [ 'vendor/assets/coffeescripts/*.coffee' ]
spec_files: [ 'spec/javascripts/*_spec.coffee' ]
src_dir: .
spec_dir: .

12
spec/lib/jasmine/files_list_spec.rb
View File

@ -14,12 +14,12 @@ describe Jasmine::FilesList do
File.join(Jasmine::Core.path, "jasmine.js"),
File.join(Jasmine::Core.path, "jasmine-html.js"),
File.join(Jasmine::Core.path, "jasmine.css"),
File.expand_path('jasmine/jasmine-extensions.js'),
File.expand_path('jasmine/intense.js'),
File.expand_path('jasmine/headless_reporter_result.js'),
File.expand_path('jasmine/jasmine.headless-reporter.js'),
File.expand_path('js-lib/jsDump.js'),
File.expand_path('js-lib/beautify-html.js'),
File.expand_path('vendor/assets/javascripts/jasmine-extensions.js'),
File.expand_path('vendor/assets/javascripts/intense.js'),
File.expand_path('vendor/assets/javascripts/headless_reporter_result.js'),
File.expand_path('vendor/assets/javascripts/jasmine.headless-reporter.js'),
File.expand_path('vendor/assets/javascripts/jsDump.js'),
File.expand_path('vendor/assets/javascripts/beautify-html.js'),
]
end
end

4
jasmine/headless_reporter_result.coffee → vendor/assets/coffeescripts/headless_reporter_result.coffee vendored
View File

@ -17,7 +17,9 @@ class window.HeadlessReporterResult
if result.lineNumber
output += " (line ~#{bestChoice.lineNumber + result.lineNumber})".foreground('red').bright()
JHW.stdout.puts(" " + output)
JHW.stdout.puts(" #{result.line}".foreground('yellow'))
if result.line?
JHW.stdout.puts(" #{result.line}".foreground('yellow'))
@findSpecLine: (splitName) ->
bestChoice = { accuracy: 0, file: null, lineNumber: null }

0
jasmine/intense.coffee → vendor/assets/coffeescripts/intense.coffee vendored
View File

0
jasmine/jasmine-extensions.coffee → vendor/assets/coffeescripts/jasmine-extensions.coffee vendored
View File

0
jasmine/jasmine.headless-reporter.coffee → vendor/assets/coffeescripts/jasmine.headless-reporter.coffee vendored
View File

1
jasmine/prolog.coffee → vendor/assets/coffeescripts/prolog.coffee vendored
View File

@ -61,3 +61,4 @@ if window.JHW
JHW._usedConsole = true
JHW.stdout.puts(msg)
window.CoffeeScriptToFilename = {}

0
js-lib/beautify-html.js → vendor/assets/javascripts/beautify-html.js vendored
View File

2
jasmine/headless_reporter_result.js → vendor/assets/javascripts/headless_reporter_result.js vendored
View File

@ -25,7 +25,7 @@
output += (" (line ~" + (bestChoice.lineNumber + result.lineNumber) + ")").foreground('red').bright();
}
JHW.stdout.puts(" " + output);
_results.push(JHW.stdout.puts((" " + result.line).foreground('yellow')));
_results.push(result.line != null ? JHW.stdout.puts((" " + result.line).foreground('yellow')) : void 0);
}
return _results;
};

0
jasmine/intense.js → vendor/assets/javascripts/intense.js vendored
View File

0
jasmine/jasmine-extensions.js → vendor/assets/javascripts/jasmine-extensions.js vendored
View File

0
jasmine/jasmine.headless-reporter.js → vendor/assets/javascripts/jasmine.headless-reporter.js vendored
View File

0
js-lib/jsDump.js → vendor/assets/javascripts/jsDump.js vendored
View File

1
jasmine/prolog.js → vendor/assets/javascripts/prolog.js vendored
View File

@ -80,4 +80,5 @@
return JHW.stdout.puts(msg);
};
}
window.CoffeeScriptToFilename = {};
}).call(this);