Permalink
Browse files

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

  • Loading branch information...
1 parent 86647dd commit 1a0f9286407b7646bf66a29035aeccb6b689d857 @zedshaw zedshaw committed Jul 8, 2011
@@ -1,4 +1,4 @@
-require 'tir/engine'
+require 'tir.engine'
local prompt_page = Tir.view("index.html")
local link_page = Tir.view("link.html")
@@ -0,0 +1,4 @@
+sender_id = '38f857b8-cbaa-4b58-9271-0d36c27813c4'
+io_threads = 1
+views = "views/"
+config_db = 'conf/config.sqlite'
@@ -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()
@@ -1,4 +1,4 @@
-require 'tir/engine'
+require 'tir.engine'
local conn = Tir.Task.connect { spec = 'ipc://run/photos' }
@@ -1,4 +1,4 @@
-require 'tir/engine'
+require 'tir.engine'
function test(args)
Tir.dump(args)
@@ -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",
@@ -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",
@@ -1,4 +1,4 @@
-require 'tir/engine'
+require 'tir.engine'
function fake_main()
@@ -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")
@@ -1,4 +1,4 @@
-require 'tir/engine'
+require 'tir.engine'
context("Tir", function()
@@ -1,5 +1,5 @@
-require 'tir/engine'
+require 'tir.engine'
context("Tir", function()
@@ -1,4 +1,4 @@
-require 'tir/engine'
+require 'tir.engine'
context("Tir", function()
context("util", function()
@@ -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 %}]]
@@ -1,4 +1,4 @@
-require 'tir/engine'
+require 'tir.engine'
local fake_conn = {
closed = false,
View
@@ -1,4 +1,4 @@
-require 'tir/engine'
+require 'tir.engine'
require 'md5'
local version, target, source_tar = unpack(arg)

0 comments on commit 1a0f928

Please sign in to comment.