From 66d4b5ac4c052dcc1aed6d7f2d9359923a1913c8 Mon Sep 17 00:00:00 2001 From: Cmdr McDonald Date: Tue, 10 Jan 2017 19:30:43 +0000 Subject: [PATCH] Fix tests due to new module values --- ChangeLog.md | 16 ++++++- .../anaconda-test-detailed-export-v4.json | 43 +++++++++++-------- __tests__/test-import.js | 2 +- package.json | 2 +- 4 files changed, 42 insertions(+), 21 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index 4209abda..48bad6ab 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -7,7 +7,6 @@ * Ensure ordering of all types of modules (standard, internal, utilities) is consistent * Add rebuilds per bay information for fighter hangars * Add ability to show military compartments - * Add diminishing returns for shield boosters * Show module reinforcement package results in defence summary * Use separate speed/rotation/acceleration multipliers for thrusters if available * Obey restricted slot rules when adding all for internal slots @@ -25,6 +24,21 @@ * Ensure that information is not lost on narrow screens * Do not lose ship selector selection on narrow screens * Reinstate jump range graph + * Use coriolis-data 2.2.6: + * Update weapons with changed values for 2.2.03 + * Add individual pitch/roll/yaw statistics for each ship + * Remove old and meaningless agility stat + * Use sane order for multi-module JSON - coriolis can re-order as it sees fit when displaying modules + * Fix cost of fighter hangars + * Update Powerplay weapons with current statistics + * Add separate min/opt/max multipliers for enhanced thrusters for speed, acceleration and rotation + * Add module reinforcement packages + * Add military compartments + * Fix missing damage value for 2B dumbfires + * Update shield recharge rates + * Reduce hull mass of Viper to 50T + * Fix incorrect optimal mass value for 8A thrusters + * Add power draw for detailed surface scanner #2.2.5 * Calculate rate of fire for multi-burst weapons diff --git a/__tests__/fixtures/anaconda-test-detailed-export-v4.json b/__tests__/fixtures/anaconda-test-detailed-export-v4.json index b80dc53e..fbe1dcfa 100644 --- a/__tests__/fixtures/anaconda-test-detailed-export-v4.json +++ b/__tests__/fixtures/anaconda-test-detailed-export-v4.json @@ -223,6 +223,7 @@ }, null, null, + null, { "class": 4, "rating": "E", @@ -261,24 +262,27 @@ "topSpeed": 186.5, "boost": 240, "boostEnergy": 27, - "topBoost": 248.62, - "topSpeed": 186.46, + "topBoost": 249.34, + "topPitch": 25.97, + "topRoll": 62.34, + "topYaw": 10.39, + "topSpeed": 187.01, "totalCost": 882362058, - "totalDpe": 143.01, - "totalDps": 102.83, + "totalDpe": 142.68, + "totalDps": 101.13, "totalEps": 22.71, "totalHps": 677.29, "totalExplDpe": 0, "totalExplDps": 0, "totalExplSDps": 0, "totalHps": 33.62, - "totalKinDpe": 119.43, - "totalKinDps": 32.51, - "totalKinSDps": 24.79, - "totalSDps": 91.3, - "totalThermDpe": 23.58, - "totalThermDps": 70.32, - "totalThermSDps": 66.51, + "totalKinDpe": 116.29, + "totalKinDps": 16.01, + "totalKinSDps": 12.09, + "totalSDps": 89.99, + "totalThermDpe": 20.44, + "totalThermDps": 53.82, + "totalThermSDps": 53.82, "baseShieldStrength": 350, "baseArmour": 945, "hullExplRes": 0.78, @@ -289,22 +293,25 @@ "pipSpeed": 0.14, "pitch": 25, "moduleCostMultiplier": 1, + "modulearmour": 0, + "moduleprotection": 0, "fuelCapacity": 32, "cargoCapacity": 128, - "ladenMass": 1339.2, + "ladenMass": 1323.2, "armour": 2227.5, "baseArmour": 525, - "unladenMass": 1179.2, + "unladenMass": 1163.2, "powerAvailable": 39.6, "powerRetracted": 23.33, "powerDeployed": 34.13, "roll": 60, - "unladenRange": 18.49, + "unladenRange": 18.74, "yaw": 10, - "fullTankRange": 18.12, - "ladenRange": 16.39, - "unladenFastestRange": 73.21, - "ladenFastestRange": 66.15, + "fullTankRange": 18.36, + "hardness": 65, + "ladenRange": 16.59, + "unladenFastestRange": 74.2, + "ladenFastestRange": 66.96, "maxJumpCount": 4, "shield": 833, "shieldCells": 1840, diff --git a/__tests__/test-import.js b/__tests__/test-import.js index 3dab44fa..a6a44dc6 100644 --- a/__tests__/test-import.js +++ b/__tests__/test-import.js @@ -238,7 +238,7 @@ describe('Import Modal', function() { expect(modal.state.singleBuild).toBe(true); clickProceed(); expect(MockRouter.go.mock.calls.length).toBe(1); - expect(MockRouter.go.mock.calls[0][0]).toBe('/outfit/federal_corvette?code=A2putsFklndzsxf50x0x7l28281919040404040402020l06p05sf63c5ifr-----.AwRj4zNaqA%3D%3D.CwRgDBldUExuBjpA.H4sIAAAAAAAAA02SP0vDUBTFb1qTtE3xtTFqav0Tbfy3KHRQB8FRO7gJOuioU%2FEDODgILrqKn0DQQUEUB3Hr0smhYhcp%2BiEEEVvf9VwhmuVw3zu%2Fe959eTH0EhF9G5A%2ByyRSl8yc2saSE7pPrCSkt24RlVyPyL9JABpuM3uzmtk9hs1JPSAk2sk9deHvfjH7XprIq6KHTb0YJY3bDtHEA8rROqCxHYSkzzvMmRcs1RzSOaXXo5k6I5DCnk1kNj6YrQoa3TM4%2Fip6OKM3ouBOFmJWcabl%2BURD10jKLWCvVN0k6m%2BBngqCYI2d%2Fx6zlgG%2BXwR%2B2RXhn3DUPcbibIw8%2Bg0WsibkvJBXqFRZLo1Lkl%2FBWKz0cjS7vwJxmijzIqGIOpLgXAxqQ51bgURCEfUkUD4GvQv0KJBIKKK6wYwcpHCmGyNfcW3nWUhCFUqlDiWuJwbN4EpOC35eJBRRDhj29erfk28h2rmQJGkKv7CZKH0yF08QZ70B8bbxAbigK1Fw8IH%2Fwp6GP9nE0qjLaw7G%2FDs8mt0QP4m1UZafh38AuKZDe4MCAAA%3D&bn=Imported%20Federal%20Corvette'); + expect(MockRouter.go.mock.calls[0][0]).toBe('/outfit/federal_corvette?code=A2putsFklndzsxf50x0x7l28281919040404040402020l06p05sf63c5ifr--v66g2f.AwRj4zNaqA%3D%3D.CwRgDBldUExuBiIlUA%3D%3D.H4sIAAAAAAAAA02SO0sDQRSFbxJ389jgJOsaN%2FGVmPXVKKRQC8FSA9oJWihWWgV%2FgIWFYBNb8RcIWiiIYiF2NqksIqaRoD%2FBQghB41zPFVa3OdzZ890zM3snpBeI6DsEyZgGkbpg5tg2lhzWGbEikN6aSVS0HSL3Ogxo6IvZmdbM9hFsjuickGgn%2B8SGv%2FvJ7DpxIqeCHjb0vJ80GrWIxu5RFmqARnYQEj%2FrMCdesFQzSOeYXvPP1BmGZPeiREa9xWyW0WifwnFX0MMJve4Hd5IQo4I9TcclGrxCUmoO34qVDaK%2BJuiJfD6%2FytZ%2Fj%2FGQAL7fD%2Fyiy8fbcNQdjsXJAFn9DRbyQchZIS9RqZJcGpckt4xjsdKL%2FtndJYjVQJkW8URUVYJTAegLat0IJOKJqCeB0gHoQ6BHgUQ8EdUNZvgghj3tAPmKa1vPQhIqTyp1KHE9AWgKV7Ka8NMinoiywLCrV%2F5Gvolo61ySpMn7xMdwsc3cf4w48w2Is40fwFld9oPzLbyL6CT88QaWoZpMcyDg32Jo0br4EaxDJXk8BT3o%2B7ktGS9B3GU8puS7zJh%2FAHGMT2qjAgAA&bn=Imported%20Federal%20Corvette'); }); it('imports a valid v4 build', function() { diff --git a/package.json b/package.json index 40992cd2..9e99f9a0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "coriolis_shipyard", - "version": "2.2.6b", + "version": "2.2.6", "repository": { "type": "git", "url": "https://github.com/EDCD/coriolis"