Fix tests

Author: vaisest

spec/System/TestItemParse_spec.lua

@@ -393,9 +393,9 @@ describe("TestItemParse", function()
 	end)
 
 	it("unscalable", function()
-		local item = new("Item", raw("{unscalable}+8 to Strength"))
+		local item = new("Item"):Item(raw("{unscalable}+8 to Strength"))
 		assert.truthy(item.explicitModLines[1].unscalable)
-		item = new("Item", raw("+8 to Strength - Unscalable Value"))
+		item = new("Item"):Item(raw("+8 to Strength - Unscalable Value"))
 		assert.truthy(item.explicitModLines[1].unscalable)
 	end)
 
@@ -480,22 +480,22 @@ describe("TestAdvancedItemParse #item", function()
 	end
 
 	it("parses to craft", function()
-		local item = new("Item", raw([[
+		local item = new("Item"):Item(raw([[
 			{ Prefix Modifier "Fecund" (Tier: 1) — Life }
 			+142(130-144) to maximum Life
 		]], "Cord Belt"))
 		assert.are.equals("IncreasedLife9", item.prefixes[1].modId)
 		assert.are.equals(0.857, item.prefixes[1].range)
 		assert.are.equals("life", item.explicitModLines[1].modTags[1])
-		item = new("Item", raw([[
+		item = new("Item"):Item(raw([[
 			{ Master Crafted Suffix Modifier "of Craft" (Rank: 3) — Elemental, Cold, Resistance }
 			+35(29-35)% to Cold Resistance
 		]], "Cord Belt"))
 		assert.truthy(item.explicitModLines[1].crafted)
 	end)
 
 	it("parses correct range", function()
-		local item = new("Item", raw([[
+		local item = new("Item"):Item(raw([[
 			{ Prefix Modifier "Freezing" (Tier: 5) — Damage, Elemental, Cold, Caster  — 8% Increased }
 			Adds 17(16-20) to 35(30-36) Cold Damage to Spells
 		]], "Void Sceptre"))
@@ -504,7 +504,7 @@ describe("TestAdvancedItemParse #item", function()
 
 	-- GGG scales each mod line separately here, but PoB scales them both together, so this parsing is a bit wonky
 	it("parses multi-line mod", function()
-		local item = new("Item", raw([[
+		local item = new("Item"):Item(raw([[
 			{ Prefix Modifier "Warlock's" (Tier: 4) — Mana, Damage, Caster }
 			32(30-37)% increased Spell Damage
 			+46(42-47) to maximum Mana
@@ -515,7 +515,7 @@ describe("TestAdvancedItemParse #item", function()
 	end)
 
 	it("resets linePrefix", function() 
-		local item = new("Item", raw([[
+		local item = new("Item"):Item(raw([[
 			{ Prefix Modifier "Warlock's" (Tier: 4) — Mana, Damage, Caster }
 			32(30-37)% increased Spell Damage
 			+46(42-47) to maximum Mana
@@ -526,7 +526,7 @@ describe("TestAdvancedItemParse #item", function()
 	end)
 
 	it("resets linePostfix", function() 
-		local item = new("Item", raw([[
+		local item = new("Item"):Item(raw([[
 			{ Corruption Enhancement — Mana }
 			24(20-30)% increased Mana Regeneration Rate
 			--------
@@ -536,7 +536,7 @@ describe("TestAdvancedItemParse #item", function()
 	end)
 
 	it("parses vaaled catalyst", function() 
-		local item = new("Item", raw([[
+		local item = new("Item"):Item(raw([[
 			Quality (Attribute Modifiers): +19% (augmented)
 			{ Unique Modifier — Attribute  — 19% Increased }
 			+120(80-100) to all Attributes
@@ -549,7 +549,7 @@ describe("TestAdvancedItemParse #item", function()
 	end)
 
 	it("parses vaaled catalyst within range", function() 
-		local item = new("Item", raw([[
+		local item = new("Item"):Item(raw([[
 			Quality (Attribute Modifiers): +19% (augmented)
 			{ Unique Modifier — Attribute  — 19% Increased }
 			+95(80-100) to all Attributes
@@ -562,7 +562,7 @@ describe("TestAdvancedItemParse #item", function()
 	end)
 
 	it("doesn't scale unscalable", function()
-		local item = new("Item", raw([[
+		local item = new("Item"):Item(raw([[
 			Quality (Life and Mana Modifiers): +20% (augmented)
 			{ Unique Modifier — Life, Defences, Energy Shield, Minion, Gem }
 			Socketed Golem Skills gain 20% of Maximum Life as Extra Maximum Energy Shield — Unscalable Value
@@ -571,7 +571,7 @@ describe("TestAdvancedItemParse #item", function()
 	end)
 
 	it("correctly matches conqueror mod", function()
-		local item = new("Item", raw([[
+		local item = new("Item"):Item(raw([[
 			{ Suffix Modifier "of the Conquest" (Tier: 1) — Elemental, Cold }
 			10(8-10)% chance to Avoid Cold Damage from Hits
 			(No chance to avoid damage can be higher than 75%)
@@ -582,15 +582,15 @@ describe("TestAdvancedItemParse #item", function()
 	end)
 
 	it("parses enchant correctly #enchant", function()
-		local item = new("Item", raw([[
+		local item = new("Item"):Item(raw([[
 			{ Corrupted Enhancement }
 			+8(6-10)% to Fire Resistance
 		]]))
 		assert.are.equals(8, item.enchantModLines[1].modList[1].value)
 	end)
 
 	it("parses enchant with tags correctly #enchant", function()
-		local item = new("Item", raw([[
+		local item = new("Item"):Item(raw([[
 			{ Corrupted Enhancement - Energy Shield }
 			+8(6-10)% to Fire Resistance
 		]]))
@@ -599,7 +599,7 @@ describe("TestAdvancedItemParse #item", function()
 	end)
 
 	it("parses junk", function()
-		local godTestItem = new("Item", [[
+		local godTestItem = new("Item"):Item([[
 			Item Class: Sceptres
 			Rarity: Unique
 			Nebulis
@@ -617,7 +617,7 @@ describe("TestAdvancedItemParse #item", function()
 			Str: 104
 			Int: 122
 			--------
-			Sockets: B R 
+			Sockets: B R
 			--------
 			Item Level: 87
 			--------

spec/System/TestTradeQueryCurrency_spec.lua

@@ -67,7 +67,7 @@ describe("TradeQuery Currency Conversion", function()
 		it("aggregates prices", function()
 			mock_tradeQuery.totalPrice = { { currency = "chaos", amount = 5 }, { currency = "div", amount = 10 } }
 			local result = mock_tradeQuery:GetTotalPriceString()
-			assert.are.equal(result, "5 chaos, 10 div")
+			assert.are.equal(result, "10 div, 5 chaos")
 		end)
 	end)
 end)