From 21d4d1f59afca24d46ce64170990395f8e6f0d71 Mon Sep 17 00:00:00 2001 From: TomBraun Date: Sat, 5 Jul 2014 08:55:59 +0200 Subject: [PATCH] Solve same conflicts with eressea/server manuale --- scripts/tests/e3a.lua | 5 +++-- scripts/tests/eressea.lua | 3 +-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/tests/e3a.lua b/scripts/tests/e3a.lua index c52446427..d37cae476 100644 --- a/scripts/tests/e3a.lua +++ b/scripts/tests/e3a.lua @@ -283,6 +283,7 @@ function test_market() for i = 0, 5 do local rn = r:next(i) end + b.working = true eressea.process.markets() u:add_item("money", -u:get_item("money")) -- now we only have herbs local len = 0 @@ -729,6 +730,6 @@ function test_building_owner_can_enter_ship() u2:add_item("money", u1.number * 100) u2:clear_orders() process_orders() - assert_equal(s1.id, u1.ship.id) - assert_not_equal(b1.id, u1.ship.id, "BUG owner of the building can not go into a ship") + assert_equal(s1, u1.ship) + assert_equal(null, u1.building, "owner of the building can not go into a ship") end diff --git a/scripts/tests/eressea.lua b/scripts/tests/eressea.lua index bdd8483d3..547f23955 100644 --- a/scripts/tests/eressea.lua +++ b/scripts/tests/eressea.lua @@ -347,7 +347,7 @@ function test_only_building_owner_can_set_not_paid() u2.building = mine u1:clear_orders() u2:clear_orders() --- Test that Bezahle nicht is working +-- Test that Bezahle nicht is working u1:add_order("Bezahle nicht") process_orders() assert_equal(500, u1:get_item("money")) @@ -358,4 +358,3 @@ function test_only_building_owner_can_set_not_paid() process_orders() assert_equal(0, u1:get_item("money")) end -