Skip to content

Commit

Permalink
Deleting unused js_test mapping from crazyfun
Browse files Browse the repository at this point in the history
  • Loading branch information
barancev committed Oct 26, 2016
1 parent d73914a commit 093bdb6
Showing 1 changed file with 0 additions and 85 deletions.
85 changes: 0 additions & 85 deletions rake-tasks/crazy_fun/mappings/javascript.rb
Original file line number Diff line number Diff line change
Expand Up @@ -173,19 +173,6 @@ def add_all(fun)
fun.add_mapping("js_fragment_csharp", Javascript::AddDependencies.new)
fun.add_mapping("js_fragment_csharp", Javascript::ConcatenateCSharp.new)

# Executes JavaScript tests in the browser.
#
# Arguments:
# srcs: List of test files.
# path: Path, relative to the client root, that the test files can be
# located.
# deps: A list of test dependencies.
fun.add_mapping("js_test", Javascript::CheckPreconditions.new)
fun.add_mapping("js_test", Javascript::CreateTask.new)
fun.add_mapping("js_test", Javascript::CreateTaskShortName.new)
fun.add_mapping("js_test", Javascript::AddDependencies.new)
fun.add_mapping("js_test", Javascript::RunTests.new)

fun.add_mapping("node_module", Javascript::CheckPreconditions.new)
fun.add_mapping("node_module", Javascript::Node::CreateTask.new)
fun.add_mapping("node_module", Javascript::CreateTaskShortName.new)
Expand Down Expand Up @@ -1295,78 +1282,6 @@ def handle(fun, dir, args)
end
end

class RunTests < BaseJs
def handle(fun, dir, args)
task_name = task_name(dir, args[:name])

java_browsers = BROWSERS.find_all { |k,v| v.has_key?(:java) }
available_browsers = java_browsers.find_all { |k,v| [nil, true].include?(v[:available]) }
listed_browsers = args[:browsers] ? Hash[*(args[:browsers]).collect { |b| [b, BROWSERS[b]]}.flatten].find_all { |k,v| !v.nil? } : java_browsers

listed_browsers.each do |browser, all_browser_data|
browser_data = all_browser_data[:java]
browser_task_name = "#{task_name}_#{browser}"
deps = [task_name]
deps.concat(browser_data[:deps]) if browser_data[:deps]

desc "Run the tests for #{browser_task_name}"
task "#{browser_task_name}:run" => deps do
puts "Testing: #{browser_task_name} " +
(ENV['log'] == 'true' ? 'Log: build/test_logs/TEST-' + browser_task_name.gsub(/[\/:]+/, '-') : '')

cp = CrazyFunJava::ClassPath.new("#{browser_task_name}:run")
puts cp
mkdir_p 'build/test_logs'

CrazyFunJava.ant.project.getBuildListeners().get(0).setMessageOutputLevel(2) if ENV['log']
CrazyFunJava.ant.junit(:fork => true, :forkmode => 'once', :showoutput => true,
:printsummary => 'on', :haltonerror => halt_on_error?, :haltonfailure => halt_on_failure?) do |ant|
ant.classpath do |ant_cp|
cp.all.each do |jar|
ant_cp.pathelement(:location => jar)
end
end

sysprops = args[:sysproperties] || []

ant.sysproperty :key => "selenium.browser", :value => browser #browser_data[:class]

sysprops.each do |map|
map.each do |key, value|
ant.sysproperty :key => key, :value => value
end
end

if ($DEBUG)
ant.jvmarg(:line => "-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005")
end

test_dir = args[:test_dir] ? File.join(dir, args[:test_dir]) : File.join(dir, 'test')
ant.sysproperty :key => 'js.test.dir', :value => test_dir

if !args[:exclude].nil?
excludes = File.join(dir, args[:exclude])
excludes = FileList[excludes].to_a.collect do |f|
f[test_dir.length + 1..-1]
end
ant.sysproperty :key => 'js.test.excludes', :value => excludes.join(',')
end

ant.formatter(:type => 'plain')
ant.formatter(:type => 'xml')

ant.test(:name => "org.openqa.selenium.javascript.ClosureTestSuite",
:outfile => "TEST-" + browser_task_name.gsub(/[\/:]+/, "-"),
:todir => 'build/test_logs')
end
CrazyFunJava.ant.project.getBuildListeners().get(0).setMessageOutputLevel($DEBUG ? 2 : 0)
end
end

task "#{task_name}:run" => (listed_browsers & available_browsers).map { |browser,_| "#{task_name}_#{browser}:run" }
end
end

module Node
class BaseNodeJsTask < BaseJs
def folder_name(dir, name)
Expand Down

0 comments on commit 093bdb6

Please sign in to comment.