Make the testing stuff work again and conform to tir.X as the require.

richardhundt · Jul 8, 2011 · 1a0f928 · 1a0f928
1 parent 86647dd
commit 1a0f928
Show file tree

Hide file tree

Showing 15 changed files with 19 additions and 13 deletions.
diff --git a/examples/arc_challenge/app/arc_challenge.lua b/examples/arc_challenge/app/arc_challenge.lua
@@ -1,4 +1,4 @@
-require 'tir/engine'
+require 'tir.engine'
 
 local prompt_page = Tir.view("index.html")
 local link_page = Tir.view("link.html")

diff --git a/examples/arc_challenge/conf/testing.lua b/examples/arc_challenge/conf/testing.lua
@@ -0,0 +1,4 @@
+sender_id = '38f857b8-cbaa-4b58-9271-0d36c27813c4'
+io_threads = 1
+views = "views/"
+config_db = 'conf/config.sqlite'
diff --git a/examples/arc_challenge/tests/app_tests/arc_challenge_tests.lua b/examples/arc_challenge/tests/app_tests/arc_challenge_tests.lua
@@ -1,5 +1,5 @@
-require 'tir/testing'
-require 'app/arc_challenge'
+require 'tir.testing'
+require 'app.arc_challenge'
 
 context("Arc Challenge", function()
     context("interaction", function()

diff --git a/examples/tasks/app/test_sender.lua b/examples/tasks/app/test_sender.lua
@@ -1,4 +1,4 @@
-require 'tir/engine'
+require 'tir.engine'
 
 local conn = Tir.Task.connect { spec = 'ipc://run/photos' }
 

diff --git a/examples/tasks/app/test_task.lua b/examples/tasks/app/test_task.lua
@@ -1,4 +1,4 @@
-require 'tir/engine'
+require 'tir.engine'
 
 function test(args)
     Tir.dump(args)

diff --git a/rockspec/tir-0.9-3.rockspec b/rockspec/tir-0.9-3.rockspec
@@ -40,6 +40,7 @@ build = {
             ['tir.view'] = 'tir/view.lua',
             ['tir.web'] = 'tir/web.lua',
             ['tir.strict'] = 'tir/strict.lua',
+            ['tir.testing'] = 'tir/testing.lua',
             ["tir.mongrel2.init"] = "tir/mongrel2/init.lua",
             ["tir.mongrel2.connection"] = "tir/mongrel2/connection.lua",
             ["tir.mongrel2.request"]    = "tir/mongrel2/request.lua",

diff --git a/rockspec/tir-scm-0.rockspec b/rockspec/tir-scm-0.rockspec
@@ -39,6 +39,7 @@ build = {
             ['tir.view'] = 'tir/view.lua',
             ['tir.web'] = 'tir/web.lua',
             ['tir.strict'] = 'tir/strict.lua',
+            ['tir.testing'] = 'tir/testing.lua',
             ["tir.mongrel2.init"] = "tir/mongrel2/init.lua",
             ["tir.mongrel2.connection"] = "tir/mongrel2/connection.lua",
             ["tir.mongrel2.request"]    = "tir/mongrel2/request.lua",

diff --git a/tests/base/error_tests.lua b/tests/base/error_tests.lua
@@ -1,4 +1,4 @@
-require 'tir/engine'
+require 'tir.engine'
 
 
 function fake_main()

diff --git a/tests/base/form_tests.lua b/tests/base/form_tests.lua
@@ -1,4 +1,4 @@
-require 'tir/engine'
+require 'tir.engine'
 
 local MULTIPART_BOUNDARY = "multipart/form-data; boundary=---------------------------21302070922692600111282794892"
 local MULTIPART_BODY = Tir.load_file("tests/data/", "multipart_sample.txt")

diff --git a/tests/base/m2_tests.lua b/tests/base/m2_tests.lua
@@ -1,4 +1,4 @@
-require 'tir/engine'
+require 'tir.engine'
 
 
 context("Tir", function()

diff --git a/tests/base/session_tests.lua b/tests/base/session_tests.lua
@@ -1,5 +1,5 @@
 
-require 'tir/engine'
+require 'tir.engine'
 
 
 context("Tir", function()

diff --git a/tests/base/util_tests.lua b/tests/base/util_tests.lua
@@ -1,4 +1,4 @@
-require 'tir/engine'
+require 'tir.engine'
 
 context("Tir", function()
     context("util", function()

diff --git a/tests/base/view_tests.lua b/tests/base/view_tests.lua
@@ -1,4 +1,4 @@
-require 'tir/engine'
+require 'tir.engine'
 
 local TEST_TEMPLATE = [[This is a {{ test }}.]]
 local ALL_ACTIONS = [[{% if test == 1 then %}{{ hello }}{% elseif test == 2 then %}{< hello >}{% else %}{( "tir-scm-0.rockspec" )}{% end %}]]

diff --git a/tests/base/web_tests.lua b/tests/base/web_tests.lua
@@ -1,4 +1,4 @@
-require 'tir/engine'
+require 'tir.engine'
 
 local fake_conn = { 
     closed = false,

diff --git a/tools/specgen.lua b/tools/specgen.lua
@@ -1,4 +1,4 @@
-require 'tir/engine'
+require 'tir.engine'
 require 'md5'
 
 local version, target, source_tar = unpack(arg)