Skip to content

Commit

Permalink
Allow jasmine::runner to take an optional list of styesheets
Browse files Browse the repository at this point in the history
  • Loading branch information
pivotalops committed Oct 13, 2009
1 parent 92ffcb4 commit 1b1c2b1
Showing 18 changed files with 20 additions and 18 deletions.
4 changes: 3 additions & 1 deletion contrib/ruby/jasmine_runner.rb
Original file line number Diff line number Diff line change
@@ -186,6 +186,8 @@ def initialize(selenium_jar_path, spec_files, dir_mappings, jasmine_files = nil,
@dir_mappings = dir_mappings
@jasmine_files = jasmine_files
@browser = options[:browser] || 'firefox'
@stylesheets = options[:stylesheets] || []


@selenium_pid = nil
@jasmine_server_pid = nil
@@ -214,7 +216,7 @@ def start_servers

@jasmine_server_pid = fork do
Process.setpgrp
Jasmine::SimpleServer.start(@jasmine_server_port, @spec_files, @dir_mappings, @jasmine_files)
Jasmine::SimpleServer.start(@jasmine_server_port, @spec_files, @dir_mappings, @jasmine_files, @stylesheets)
exit! 0
end
puts "jasmine server started. pid is #{@jasmine_server_pid}"
2 changes: 1 addition & 1 deletion doc/files.html
Original file line number Diff line number Diff line change
@@ -258,7 +258,7 @@ <h2><a href="symbols/src/lib_TrivialReporter.js.html">lib/TrivialReporter.js</a>
</div>
<div class="fineprint" style="clear:both">

Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blankt">JsDoc Toolkit</a> 2.1.0 on Tue Oct 13 2009 14:46:34 GMT-0700 (PDT)
Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blankt">JsDoc Toolkit</a> 2.1.0 on Tue Oct 13 2009 15:15:06 GMT-0700 (PDT)
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion doc/index.html
Original file line number Diff line number Diff line change
@@ -300,7 +300,7 @@ <h2><a href="symbols/jasmine.util.html">jasmine.util</a></h2>
</div>
<div class="fineprint" style="clear:both">

Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blankt">JsDoc Toolkit</a> 2.1.0 on Tue Oct 13 2009 14:46:34 GMT-0700 (PDT)
Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blankt">JsDoc Toolkit</a> 2.1.0 on Tue Oct 13 2009 15:15:06 GMT-0700 (PDT)
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion doc/symbols/_global_.html
Original file line number Diff line number Diff line change
@@ -908,7 +908,7 @@ <h1 class="classTitle">
<!-- ============================== footer ================================= -->
<div class="fineprint" style="clear:both">

Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blank">JsDoc Toolkit</a> 2.1.0 on Tue Oct 13 2009 14:46:33 GMT-0700 (PDT)
Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blank">JsDoc Toolkit</a> 2.1.0 on Tue Oct 13 2009 15:15:06 GMT-0700 (PDT)
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion doc/symbols/jasmine.Block.html
Original file line number Diff line number Diff line change
@@ -339,7 +339,7 @@ <h1 class="classTitle">
<!-- ============================== footer ================================= -->
<div class="fineprint" style="clear:both">

Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blank">JsDoc Toolkit</a> 2.1.0 on Tue Oct 13 2009 14:46:33 GMT-0700 (PDT)
Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blank">JsDoc Toolkit</a> 2.1.0 on Tue Oct 13 2009 15:15:06 GMT-0700 (PDT)
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion doc/symbols/jasmine.Env.html
Original file line number Diff line number Diff line change
@@ -507,7 +507,7 @@ <h1 class="classTitle">
<!-- ============================== footer ================================= -->
<div class="fineprint" style="clear:both">

Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blank">JsDoc Toolkit</a> 2.1.0 on Tue Oct 13 2009 14:46:33 GMT-0700 (PDT)
Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blank">JsDoc Toolkit</a> 2.1.0 on Tue Oct 13 2009 15:15:06 GMT-0700 (PDT)
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion doc/symbols/jasmine.JsApiReporter.html
Original file line number Diff line number Diff line change
@@ -316,7 +316,7 @@ <h1 class="classTitle">
<!-- ============================== footer ================================= -->
<div class="fineprint" style="clear:both">

Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blank">JsDoc Toolkit</a> 2.1.0 on Tue Oct 13 2009 14:46:33 GMT-0700 (PDT)
Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blank">JsDoc Toolkit</a> 2.1.0 on Tue Oct 13 2009 15:15:06 GMT-0700 (PDT)
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion doc/symbols/jasmine.MultiReporter.html
Original file line number Diff line number Diff line change
@@ -316,7 +316,7 @@ <h1 class="classTitle">
<!-- ============================== footer ================================= -->
<div class="fineprint" style="clear:both">

Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blank">JsDoc Toolkit</a> 2.1.0 on Tue Oct 13 2009 14:46:33 GMT-0700 (PDT)
Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blank">JsDoc Toolkit</a> 2.1.0 on Tue Oct 13 2009 15:15:06 GMT-0700 (PDT)
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion doc/symbols/jasmine.NestedResults.html
Original file line number Diff line number Diff line change
@@ -700,7 +700,7 @@ <h1 class="classTitle">
<!-- ============================== footer ================================= -->
<div class="fineprint" style="clear:both">

Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blank">JsDoc Toolkit</a> 2.1.0 on Tue Oct 13 2009 14:46:33 GMT-0700 (PDT)
Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blank">JsDoc Toolkit</a> 2.1.0 on Tue Oct 13 2009 15:15:06 GMT-0700 (PDT)
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion doc/symbols/jasmine.Reporter.html
Original file line number Diff line number Diff line change
@@ -316,7 +316,7 @@ <h1 class="classTitle">
<!-- ============================== footer ================================= -->
<div class="fineprint" style="clear:both">

Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blank">JsDoc Toolkit</a> 2.1.0 on Tue Oct 13 2009 14:46:33 GMT-0700 (PDT)
Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blank">JsDoc Toolkit</a> 2.1.0 on Tue Oct 13 2009 15:15:06 GMT-0700 (PDT)
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion doc/symbols/jasmine.Runner.html
Original file line number Diff line number Diff line change
@@ -418,7 +418,7 @@ <h1 class="classTitle">
<!-- ============================== footer ================================= -->
<div class="fineprint" style="clear:both">

Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blank">JsDoc Toolkit</a> 2.1.0 on Tue Oct 13 2009 14:46:33 GMT-0700 (PDT)
Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blank">JsDoc Toolkit</a> 2.1.0 on Tue Oct 13 2009 15:15:06 GMT-0700 (PDT)
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion doc/symbols/jasmine.Spec.html
Original file line number Diff line number Diff line change
@@ -396,7 +396,7 @@ <h1 class="classTitle">
<!-- ============================== footer ================================= -->
<div class="fineprint" style="clear:both">

Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blank">JsDoc Toolkit</a> 2.1.0 on Tue Oct 13 2009 14:46:33 GMT-0700 (PDT)
Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blank">JsDoc Toolkit</a> 2.1.0 on Tue Oct 13 2009 15:15:06 GMT-0700 (PDT)
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion doc/symbols/jasmine.Spy.html
Original file line number Diff line number Diff line change
@@ -845,7 +845,7 @@ <h1 class="classTitle">
<!-- ============================== footer ================================= -->
<div class="fineprint" style="clear:both">

Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blank">JsDoc Toolkit</a> 2.1.0 on Tue Oct 13 2009 14:46:34 GMT-0700 (PDT)
Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blank">JsDoc Toolkit</a> 2.1.0 on Tue Oct 13 2009 15:15:06 GMT-0700 (PDT)
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion doc/symbols/jasmine.Suite.html
Original file line number Diff line number Diff line change
@@ -436,7 +436,7 @@ <h1 class="classTitle">
<!-- ============================== footer ================================= -->
<div class="fineprint" style="clear:both">

Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blank">JsDoc Toolkit</a> 2.1.0 on Tue Oct 13 2009 14:46:34 GMT-0700 (PDT)
Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blank">JsDoc Toolkit</a> 2.1.0 on Tue Oct 13 2009 15:15:06 GMT-0700 (PDT)
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion doc/symbols/jasmine.html
Original file line number Diff line number Diff line change
@@ -728,7 +728,7 @@ <h1 class="classTitle">
<!-- ============================== footer ================================= -->
<div class="fineprint" style="clear:both">

Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blank">JsDoc Toolkit</a> 2.1.0 on Tue Oct 13 2009 14:46:33 GMT-0700 (PDT)
Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blank">JsDoc Toolkit</a> 2.1.0 on Tue Oct 13 2009 15:15:06 GMT-0700 (PDT)
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion doc/symbols/jasmine.util.html
Original file line number Diff line number Diff line change
@@ -316,7 +316,7 @@ <h1 class="classTitle">
<!-- ============================== footer ================================= -->
<div class="fineprint" style="clear:both">

Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blank">JsDoc Toolkit</a> 2.1.0 on Tue Oct 13 2009 14:46:34 GMT-0700 (PDT)
Documentation generated by <a href="http://www.jsdoctoolkit.org/" target="_blank">JsDoc Toolkit</a> 2.1.0 on Tue Oct 13 2009 15:15:06 GMT-0700 (PDT)
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion doc/symbols/src/lib_jasmine-0.9.0.js.html
Original file line number Diff line number Diff line change
@@ -529,7 +529,7 @@
<span class='line'>522</span> </span><span class="WHIT"> </span><span class="STRN">"major"</span><span class="PUNC">:</span><span class="WHIT"> </span><span class="NUMB">0</span><span class="PUNC">,</span><span class="WHIT">
<span class='line'>523</span> </span><span class="WHIT"> </span><span class="STRN">"minor"</span><span class="PUNC">:</span><span class="WHIT"> </span><span class="NUMB">9</span><span class="PUNC">,</span><span class="WHIT">
<span class='line'>524</span> </span><span class="WHIT"> </span><span class="STRN">"build"</span><span class="PUNC">:</span><span class="WHIT"> </span><span class="NUMB">0</span><span class="PUNC">,</span><span class="WHIT">
<span class='line'>525</span> </span><span class="WHIT"> </span><span class="STRN">"revision"</span><span class="PUNC">:</span><span class="WHIT"> </span><span class="NUMB">1255469309</span><span class="WHIT">
<span class='line'>525</span> </span><span class="WHIT"> </span><span class="STRN">"revision"</span><span class="PUNC">:</span><span class="WHIT"> </span><span class="NUMB">1255470394</span><span class="WHIT">
<span class='line'>526</span> </span><span class="WHIT"> </span><span class="PUNC">}</span><span class="PUNC">;</span><span class="WHIT">
<span class='line'>527</span> </span><span class="COMM">/**
<span class='line'>528</span> * @namespace
2 changes: 1 addition & 1 deletion lib/jasmine-0.9.0.js
Original file line number Diff line number Diff line change
@@ -522,7 +522,7 @@ jasmine.version_= {
"major": 0,
"minor": 9,
"build": 0,
"revision": 1255470394
"revision": 1255472107
};
/**
* @namespace

0 comments on commit 1b1c2b1

Please sign in to comment.