Merge pull request #657 from strawbrary/master

Re-enable block-scoped-var + padded-blocks

Author: quicksnap

.eslintrc

@@ -12,10 +12,6 @@
     "import/namespace": 0,
     "import/no-unresolved": 0,
     "import/no-named-as-default": 2,
-    // Temporarirly disabled due to a possible bug in babel-eslint (todomvc example)
-    "block-scoped-var": 0,
-    // Temporarily disabled for test/* until babel/babel-eslint#33 is resolved
-    "padded-blocks": 0,
     "comma-dangle": 0,  // not sure why airbnb turned this on. gross!
     "indent": [2, 2, {"SwitchCase": 1}],
     "no-console": 0,

api/actions/__tests__/widget-load-test.js

@@ -3,15 +3,13 @@ import load from '../widget/load';
 import sinon from 'sinon';
 
 describe('widget load', () => {
-
   afterEach(()=> {
     if ('restore' in Math.random) {
       Math.random.restore(); // reset the Math.random fixture
     }
   });
 
   describe('successful', () => {
-
     beforeEach(()=> {
       sinon.stub(Math, 'random').returns(0.4);
     });
@@ -28,12 +26,9 @@ describe('widget load', () => {
         expect(widgets[0].color).to.equal('Red');
       });
     });
-
   });
 
-
   describe('unsuccessful', () => {
-
     beforeEach(()=> {
       sinon.stub(Math, 'random').returns(0.2);
     });
@@ -47,6 +42,5 @@ describe('widget load', () => {
           expect(err).to.equal('Widget load fails 33% of the time. You were unlucky.');
         });
     });
-
   });
 });

api/actions/__tests__/widget-update-test.js

@@ -3,15 +3,13 @@ import update from '../widget/update';
 import sinon from 'sinon';
 
 describe('widget update', () => {
-
   afterEach(()=> {
     if ('restore' in Math.random) {
       Math.random.restore(); // reset the Math.random fixture
     }
   });
 
   describe('randomly successful', () => {
-
     beforeEach(()=> {
       sinon.stub(Math, 'random').returns(0.3);
     });
@@ -37,7 +35,6 @@ describe('widget update', () => {
   });
 
   describe('randomly unsuccessful', () => {
-
     beforeEach(()=> {
       sinon.stub(Math, 'random').returns(0.1);
     });