Sync resistor-color-duo to 2.1.0

exercises/resistor-color-duo/README.md

@@ -4,27 +4,22 @@ If you want to build something using a Raspberry Pi, you'll probably use _resist
 
 * Each resistor has a resistance value.
 * Resistors are small - so small in fact that if you printed the resistance value on them, it would be hard to read.
-To get around this problem, manufacturers print color-coded bands onto the resistors to denote their resistance values. Each band acts as a digit of a number. For example, if they printed a brown band (value 1) followed by a green band (value 5), it would translate to the number 15.
 
-In this exercise, you are going to create a helpful program so that you don't have to remember the values of the bands. The program will take two colors as input, and output the correct number.
+To get around this problem, manufacturers print color-coded bands onto the resistors to denote their resistance values. Each band has a position and a numeric value. For example, if they printed a brown band (value 1) followed by a green band (value 5), it would translate to the number 15.
 
-The band colors are encoded as follows:
+In this exercise you are going to create a helpful program so that you don't have to remember the values of the bands. The program will take color names as input and output a two digit number, even if the input is more than two colors!
 
-- Black: 0
-- Brown: 1
-- Red: 2
-- Orange: 3
-- Yellow: 4
-- Green: 5
-- Blue: 6
-- Violet: 7
-- Grey: 8
-- White: 9
+The colors are mapped to the numbers from 0 to 9 in the sequence:
+Black - Brown - Red - Orange - Yellow - Green - Blue - Violet - Grey - White
+
+From the example above:
+brown-green should return 15
+brown-green-violet should return 15 too, ignoring the third color.
 
 ## Setup
 
-Go through the setup instructions for Javascript to install the necessary
-dependencies:
+Go through the setup instructions for Javascript to
+install the necessary dependencies:
 
 [https://exercism.io/tracks/javascript/installation](https://exercism.io/tracks/javascript/installation)
 
@@ -46,14 +41,13 @@ $ npm test
 
 In the test suites all tests but the first have been skipped.
 
-Once you get a test passing, you can enable the next one by changing `xtest` to
-`test`.
+Once you get a test passing, you can enable the next one by
+changing `xtest` to `test`.
 
 ## Source
 
 Maud de Vries, Erik Schierboom [https://github.com/exercism/problem-specifications/issues/1464](https://github.com/exercism/problem-specifications/issues/1464)
 
 ## Submitting Incomplete Solutions
 
-It's possible to submit an incomplete solution so you can see how others have
-completed the exercise.
+It's possible to submit an incomplete solution so you can see how others have completed the exercise.

exercises/resistor-color-duo/example.js

@@ -1,8 +1,10 @@
+// resistor-color solution START
 const COLORS = [
   'black', 'brown', 'red', 'orange', 'yellow', 'green',
   'blue', 'violet', 'grey', 'white',
 ];
 
-const reducer = (acc, color, i) => acc + COLORS.indexOf(color) * (10 ** i);
+const colorCode = color => COLORS.indexOf(color)
+// resistor-color solution END
 
-export const value = colors => colors.reverse().reduce(reducer, 0);
+export const value = ([tens, ones]) => colorCode(tens) * 10 + colorCode(ones);

exercises/resistor-color-duo/package.json

@@ -1,5 +1,6 @@
 {
   "name": "exercism-javascript",
+  "version": "2.1.0",
   "description": "Exercism exercises in Javascript.",
   "author": "Katrina Owen",
   "private": true,

exercises/resistor-color-duo/resistor-color-duo.spec.js

@@ -16,4 +16,8 @@ describe('Resistor Colors', () => {
   xtest('Orange and orange', () => {
     expect(value(['orange', 'orange'])).toEqual(33);
   });
+
+  xtest('Ignore additional colors', () => {
+    expect(value(['green', 'brown', 'orange'])).toEqual(51);
+  })
 });