Skip to content

Commit 093bdb6

Browse files
committed
Deleting unused js_test mapping from crazyfun
1 parent d73914a commit 093bdb6

1 file changed

Lines changed: 0 additions & 85 deletions

File tree

rake-tasks/crazy_fun/mappings/javascript.rb

Lines changed: 0 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -173,19 +173,6 @@ def add_all(fun)
173173
fun.add_mapping("js_fragment_csharp", Javascript::AddDependencies.new)
174174
fun.add_mapping("js_fragment_csharp", Javascript::ConcatenateCSharp.new)
175175

176-
# Executes JavaScript tests in the browser.
177-
#
178-
# Arguments:
179-
# srcs: List of test files.
180-
# path: Path, relative to the client root, that the test files can be
181-
# located.
182-
# deps: A list of test dependencies.
183-
fun.add_mapping("js_test", Javascript::CheckPreconditions.new)
184-
fun.add_mapping("js_test", Javascript::CreateTask.new)
185-
fun.add_mapping("js_test", Javascript::CreateTaskShortName.new)
186-
fun.add_mapping("js_test", Javascript::AddDependencies.new)
187-
fun.add_mapping("js_test", Javascript::RunTests.new)
188-
189176
fun.add_mapping("node_module", Javascript::CheckPreconditions.new)
190177
fun.add_mapping("node_module", Javascript::Node::CreateTask.new)
191178
fun.add_mapping("node_module", Javascript::CreateTaskShortName.new)
@@ -1295,78 +1282,6 @@ def handle(fun, dir, args)
12951282
end
12961283
end
12971284

1298-
class RunTests < BaseJs
1299-
def handle(fun, dir, args)
1300-
task_name = task_name(dir, args[:name])
1301-
1302-
java_browsers = BROWSERS.find_all { |k,v| v.has_key?(:java) }
1303-
available_browsers = java_browsers.find_all { |k,v| [nil, true].include?(v[:available]) }
1304-
listed_browsers = args[:browsers] ? Hash[*(args[:browsers]).collect { |b| [b, BROWSERS[b]]}.flatten].find_all { |k,v| !v.nil? } : java_browsers
1305-
1306-
listed_browsers.each do |browser, all_browser_data|
1307-
browser_data = all_browser_data[:java]
1308-
browser_task_name = "#{task_name}_#{browser}"
1309-
deps = [task_name]
1310-
deps.concat(browser_data[:deps]) if browser_data[:deps]
1311-
1312-
desc "Run the tests for #{browser_task_name}"
1313-
task "#{browser_task_name}:run" => deps do
1314-
puts "Testing: #{browser_task_name} " +
1315-
(ENV['log'] == 'true' ? 'Log: build/test_logs/TEST-' + browser_task_name.gsub(/[\/:]+/, '-') : '')
1316-
1317-
cp = CrazyFunJava::ClassPath.new("#{browser_task_name}:run")
1318-
puts cp
1319-
mkdir_p 'build/test_logs'
1320-
1321-
CrazyFunJava.ant.project.getBuildListeners().get(0).setMessageOutputLevel(2) if ENV['log']
1322-
CrazyFunJava.ant.junit(:fork => true, :forkmode => 'once', :showoutput => true,
1323-
:printsummary => 'on', :haltonerror => halt_on_error?, :haltonfailure => halt_on_failure?) do |ant|
1324-
ant.classpath do |ant_cp|
1325-
cp.all.each do |jar|
1326-
ant_cp.pathelement(:location => jar)
1327-
end
1328-
end
1329-
1330-
sysprops = args[:sysproperties] || []
1331-
1332-
ant.sysproperty :key => "selenium.browser", :value => browser #browser_data[:class]
1333-
1334-
sysprops.each do |map|
1335-
map.each do |key, value|
1336-
ant.sysproperty :key => key, :value => value
1337-
end
1338-
end
1339-
1340-
if ($DEBUG)
1341-
ant.jvmarg(:line => "-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005")
1342-
end
1343-
1344-
test_dir = args[:test_dir] ? File.join(dir, args[:test_dir]) : File.join(dir, 'test')
1345-
ant.sysproperty :key => 'js.test.dir', :value => test_dir
1346-
1347-
if !args[:exclude].nil?
1348-
excludes = File.join(dir, args[:exclude])
1349-
excludes = FileList[excludes].to_a.collect do |f|
1350-
f[test_dir.length + 1..-1]
1351-
end
1352-
ant.sysproperty :key => 'js.test.excludes', :value => excludes.join(',')
1353-
end
1354-
1355-
ant.formatter(:type => 'plain')
1356-
ant.formatter(:type => 'xml')
1357-
1358-
ant.test(:name => "org.openqa.selenium.javascript.ClosureTestSuite",
1359-
:outfile => "TEST-" + browser_task_name.gsub(/[\/:]+/, "-"),
1360-
:todir => 'build/test_logs')
1361-
end
1362-
CrazyFunJava.ant.project.getBuildListeners().get(0).setMessageOutputLevel($DEBUG ? 2 : 0)
1363-
end
1364-
end
1365-
1366-
task "#{task_name}:run" => (listed_browsers & available_browsers).map { |browser,_| "#{task_name}_#{browser}:run" }
1367-
end
1368-
end
1369-
13701285
module Node
13711286
class BaseNodeJsTask < BaseJs
13721287
def folder_name(dir, name)

0 commit comments

Comments
 (0)