Top speed display and test tweaks

cmmcleod · Sep 18, 2015 · 67bd56e · 67bd56e
1 parent 95f5e8e
commit 67bd56e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/app/js/shipyard/module-shipyard.js b/app/js/shipyard/module-shipyard.js
@@ -87,10 +87,10 @@ angular.module('shipyard', ['ngLodash'])
     },
     {                   // 1
       title: 'speed',
-      props: ['speed', 'boost'],
+      props: ['topSpeed', 'boost'],
       lbls: ['thrusters', 'boost'],
       unit: 'm/s',
-      fmt: 'fRound'
+      fmt: 'fCrd'
     },
     {                   // 2
       title: 'armour',

diff --git a/test/tests/test-factory-ship.js b/test/tests/test-factory-ship.js
@@ -21,7 +21,8 @@ describe("Ship Factory", function() {
       ship.buildWith(shipData.defaults);
 
       expect(ship.totalCost).toEqual(shipData.retailCost, s + ' retail cost does not match default build cost');
-      expect(ship.priorityBands[0].retracted).toBeGreaterThan(0, s + ' cargo');
+      expect(ship.cargoCapacity).toBeDefined(s + ' cargo');
+      expect(ship.priorityBands[0].retracted).toBeGreaterThan(0, s + ' priorityBands');
       expect(ship.powerAvailable).toBeGreaterThan(0, s + ' powerAvailable');
       expect(ship.unladenRange).toBeGreaterThan(0, s + ' unladenRange');
       expect(ship.ladenRange).toBeGreaterThan(0, s + ' ladenRange');
@@ -30,6 +31,7 @@ describe("Ship Factory", function() {
       expect(ship.ladenTotalRange).toBeGreaterThan(0, s + ' ladenTotalRange');
       expect(ship.shieldStrength).toBeGreaterThan(0, s + ' shieldStrength');
       expect(ship.armour).toBeGreaterThan(0, s + ' armour');
+      expect(ship.topSpeed).toBeGreaterThan(0, s + ' topSpeed');
     }
   });