Permalink
Browse files

fixing tests

  • Loading branch information...
1 parent d915e32 commit 7783cb901d242afd8be3f8616d05dbf4b7face8a @romand romand committed Apr 23, 2012
Showing with 8 additions and 8 deletions.
  1. +1 −1 examples/ruby/simple/simple.rb
  2. +1 −1 test/helpers.rb
  3. +1 −1 test/test_basic.rb
  4. +5 −5 test/test_common_features.rb
@@ -30,7 +30,7 @@
# once worker merged, following attempts will be ignored
code.merge_exec('anything')
-#> code.worker.path.end_with? '/worker.rb'
+#> code.exec.path.end_with? '/worker.rb'
# if worker requires some gems, we
View
@@ -15,7 +15,7 @@ def worker_code(str)
File.open(tmpfname, "w") { |f| f << str }
puts "created #{tmpfname}"
- merge_worker(tmpfname)
+ merge_exec(tmpfname)
end
end
View
@@ -3,7 +3,7 @@
class BasicTest < IWNGTest
def _test_basic
code = IronWorkerNG::Code::Ruby.new('test_basic')
- code.merge_worker(File.dirname(__FILE__) + '/hello.rb')
+ code.merge_exec(File.dirname(__FILE__) + '/hello.rb')
client.codes_create(code)
task_id = client.tasks_create('test_basic').id
client.tasks_wait_for(task_id)
@@ -6,7 +6,7 @@ class CommonFeaturesTest < IWNGTest
def test_merge_file
code = code_bundle('test') do
merge_file('test', 'test/data/dir2')
- merge_worker('test/hello.rb')
+ merge_exec('test/hello.rb')
end
inspect_zip(code) do |zip|
@@ -17,7 +17,7 @@ def test_merge_file
def test_merge_file_no_dest
code = code_bundle('test') do
merge_file('Gemfile')
- merge_worker('test/hello.rb')
+ merge_exec('test/hello.rb')
end
inspect_zip(code) do |zip|
@@ -36,7 +36,7 @@ def test_merge_dir_check
def test_merge_dir
code = code_bundle('test') do
merge_dir('test/data/dir2', 'test/data')
- merge_worker('test/hello.rb')
+ merge_exec('test/hello.rb')
end
inspect_zip(code) do |zip|
@@ -47,7 +47,7 @@ def test_merge_dir
def test_merge_dir_no_dest
code = code_bundle('test') do
merge_dir('test')
- merge_worker('test/hello.rb')
+ merge_exec('test/hello.rb')
end
inspect_zip(code) do |zip|
@@ -78,7 +78,7 @@ def test_symlinks
client.tasks_wait_for(task_id)
log = client.tasks_log(task_id)
- assert_equal "test", log
+ assert_equal "test\n", log
File.unlink 'test/data/dir1/dir2'
end

0 comments on commit 7783cb9

Please sign in to comment.