Fixed year/decade and wrote test for checking in future

apietrzak · Apr 15, 2018 · 2fcec34 · 2fcec34
1 parent 9210cc9
commit 2fcec34
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/lib/type/unit/Unit.js b/lib/type/unit/Unit.js
@@ -2168,7 +2168,7 @@ function factory (type, config, load, typed, math) {
       offset: 0
     },
     decade: {
-      name: 'year',
+      name: 'decade',
       base: BASE_UNITS.TIME,
       prefixes: PREFIXES.NONE,
       value: 315576000, //Julian decade
@@ -2480,7 +2480,7 @@ function factory (type, config, load, typed, math) {
       offset: 0
     },
     watt: {
-      name: 'W',
+      name: 'watt',
       base: BASE_UNITS.POWER,
       prefixes: PREFIXES.LONG,
       value: 1,
@@ -2791,6 +2791,7 @@ function factory (type, config, load, typed, math) {
     weeks: 'week',
     months: 'month',
     years: 'year',
+    decades: 'decade',
 
     hertz: 'hertz',
 

diff --git a/test/type/unit/Unit.test.js b/test/type/unit/Unit.test.js
@@ -1063,6 +1063,12 @@ describe('Unit', function() {
       assert.equal(new Unit(1, 'ohm^-1').equals(new Unit(1, 'S'))  , true);
       assert.equal(new Unit(1, 'eV')    .equals(new Unit(1.602176565e-19, 'J')), true);
     });
+
+    it("For each built-in unit, 'name' should match key", function() {
+      for(var key in Unit.UNITS) {
+        assert.equal(key, Unit.UNITS[key].name);
+      }
+    });
   });
 
   describe('createUnitSingle', function() {