github-migration/flowerbox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

small cleanups

Browse Source
This commit is contained in:
John Bintz 2012-03-21 18:43:45 -04:00
parent 9de5460533
commit 1b1c160639
4 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/assets/javascripts/flowerbox.js.coffee
View File

@ -9,9 +9,10 @@ Flowerbox =
contact: (url, data...) -> contact: (url, data...) ->
Flowerbox.started = true Flowerbox.started = true
Flowerbox.done = true if url == 'results'
if !Flowerbox.debug if !Flowerbox.debug
Flowerbox.socket.send(JSON.stringify([ url, data ])) Flowerbox.socket.send(JSON.stringify([ url, data ]))
Flowerbox.done = true if url == 'results'
started: false started: false
done: false done: false

1
lib/flowerbox/runner/node.rb
View File

@ -93,7 +93,6 @@ jsdom.env(
} }
if (!gotFlowerbox && context.Flowerbox) { if (!gotFlowerbox && context.Flowerbox) {
context.Flowerbox.baseUrl = "http://localhost:#{server.port}/";
context.Flowerbox.environment = 'node'; context.Flowerbox.environment = 'node';
context.Flowerbox.UNKNOWN = '#{Flowerbox::Result::FileInfo::UNKNOWN}'; context.Flowerbox.UNKNOWN = '#{Flowerbox::Result::FileInfo::UNKNOWN}';

3
lib/flowerbox/runner/selenium.rb
View File

@ -62,9 +62,6 @@ console.log = function(msg) {
#{template_files.join("\n")} #{template_files.join("\n")}
<script type="text/javascript"> <script type="text/javascript">
Flowerbox.environment = '#{name}'; Flowerbox.environment = '#{name}';
Flowerbox.onQueueStateChange = function(msg) {
//document.getElementById('queue').innerHTML = document.getElementById('queue').innerHTML + "\\n" + msg;
};
Flowerbox.UNKNOWN = '#{Flowerbox::Result::FileInfo::UNKNOWN}'; Flowerbox.UNKNOWN = '#{Flowerbox::Result::FileInfo::UNKNOWN}';
var context = this; var context = this;

1
lib/flowerbox/server.rb
View File

@ -64,7 +64,6 @@ module Flowerbox
} }
end end
::Rack::Handler::Thin.run(rack_app, server_options) do |server| ::Rack::Handler::Thin.run(rack_app, server_options) do |server|
Thread.current[:server] = server Thread.current[:server] = server