up

1-js/04-object-basics/06-constructor-new/4-calculator-extendable/_js.view/solution.js

@@ -1,17 +1,13 @@
 function Calculator() {
 
-  var methods = {
-    "-": function(a, b) {
-      return a - b;
-    },
-    "+": function(a, b) {
-      return a + b;
-    }
+  let methods = {
+    "-": (a, b) => a - b,
+    "+": (a, b) => a + b
   };
 
   this.calculate = function(str) {
 
-    var split = str.split(' '),
+    let split = str.split(' '),
       a = +split[0],
       op = split[1],
       b = +split[2]

1-js/04-object-basics/06-constructor-new/4-calculator-extendable/_js.view/test.js

@@ -1,26 +1,25 @@
-var calculator;
-before(function() {
-  calculator = new Calculator;
-});
+describe("Calculator", function() {
+  let calculator;
 
-it("calculate(12 + 34) = 46", function() {
-  assert.equal(calculator.calculate("12 + 34"), 46);
-});
-
-it("calculate(34 - 12) = 22", function() {
-  assert.equal(calculator.calculate("34 - 12"), 22);
-});
-
-it("добавили умножение: calculate(2 * 3) = 6", function() {
-  calculator.addMethod("*", function(a, b) {
-    return a * b;
+  before(function() {
+    calculator = new Calculator;
   });
-  assert.equal(calculator.calculate("2 * 3"), 6);
-});
 
-it("добавили возведение в степень: calculate(2 ** 3) = 8", function() {
-  calculator.addMethod("**", function(a, b) {
-    return Math.pow(a, b);
+  it("calculate(12 + 34) = 46", function() {
+    assert.equal(calculator.calculate("12 + 34"), 46);
   });
-  assert.equal(calculator.calculate("2 ** 3"), 8);
-});
+
+  it("calculate(34 - 12) = 22", function() {
+    assert.equal(calculator.calculate("34 - 12"), 22);
+  });
+
+  it("add multiplication: calculate(2 * 3) = 6", function() {
+    calculator.addMethod("*", (a, b) => a * b);
+    assert.equal(calculator.calculate("2 * 3"), 6);
+  });
+
+  it("add power: calculate(2 ** 3) = 8", function() {
+    calculator.addMethod("**", (a, b) => a ** b);
+    assert.equal(calculator.calculate("2 ** 3"), 8);
+  });
+});