Merge pull request #7 from justeat/v0.6.0

v0.6.0 - Updated & fixed npm scripts.
justeat · Dec 20, 2017 · e113248 · e113248
2 parents b3da842 + 67df04e
commit e113248
Show file tree

Hide file tree

Showing 7 changed files with 1,934 additions and 1,140 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,11 +6,5 @@ node_js:
 
 cache: yarn
 
-before_script:
-  - yarn run lint
-
-script:
-  - yarn test:cover
-
 after_success:
-  - yarn run test:cover:CI
+  - yarn run test:coveralls
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,23 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 
+v0.6.0
+------------------------------
+*December 20, 2017*
+
+### Added
+- Added lint paths to build config.
+- Using `concurrently` to run npm scripts concurrently...!
+
+### Changed
+- Updated package versions.
+- Updated unit test helper function names.
+- Updated Travis config.
+- Tidied up npm scripts config.
+- Fixed ESlint issues.
+
+
+
 v0.5.0
 ------------------------------
 *September 21, 2017*

diff --git a/gulpfile.js b/gulpfile.js
@@ -1,4 +1,8 @@
 const gulp = require('gulp');
 const { build } = require('@justeat/gulp-build-fozzie');
 
-build(gulp);
+build(gulp, {
+    js: {
+        lintPaths: ['{src,test}/**/*.js']
+    }
+});
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@justeat/f-toggle",
   "description": "Fozzie vanilla JS toggle library.",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "main": "dist/index.js",
   "homepage": "https://github.com/justeat/f-toggle",
   "contributors": [
@@ -23,24 +23,24 @@
     "qwery": "^4.0.0"
   },
   "devDependencies": {
-    "@justeat/gulp-build-fozzie": "^6.0.0",
+    "@justeat/gulp-build-fozzie": "^6.5.0",
     "babel-cli": "^6.26.0",
     "babel-preset-babili": "^0.1.4",
     "babel-preset-es2015": "^6.24.1",
-    "coveralls": "^2.13.1",
+    "concurrently": "^3.5.1",
+    "coveralls": "^3.0.0",
     "gulp": "^3.9.1",
-    "js-test-buddy": "^0.0.3"
+    "js-test-buddy": "^0.0.7"
   },
   "keywords": [
     "fozzie"
   ],
   "scripts": {
-    "prepare": "yarn run lint && yarn test && yarn run compile",
+    "prepare": "concurrently -n \"lint,compile,test\" -c \"blue,yellow,green\" --kill-others-on-fail \"yarn lint\" \"yarn compile\" \"yarn run test\"",
+    "lint": "gulp scripts:lint",
     "compile": "babel -d dist src",
-    "test": "gulp scripts:test",
-    "test:cover": "gulp scripts:test:coverage",
-    "test:cover:CI": "cat coverage/lcov.info | coveralls",
-    "lint": "gulp scripts:lint"
+    "test": "gulp scripts:test:coverage",
+    "test:coveralls": "cat coverage/lcov.info | coveralls"
   },
   "jest": {
     "collectCoverageFrom": [

diff --git a/src/index.js b/src/index.js
@@ -75,7 +75,7 @@ const setupToggle = () => {
             });
         });
 
-}
+};
 
 ready(() => {
 

diff --git a/test/index.test.js b/test/index.test.js
@@ -1,5 +1,5 @@
-import toggle from '../src/index';
 import TestUtils from 'js-test-buddy';
+import toggle from '../src/index';
 
 
 describe('module', () => {
@@ -14,7 +14,7 @@ describe('toggle', () => {
 
     it('adds hidden class', () => {
         // Arrange
-        TestUtils.setHtml(`
+        TestUtils.setBodyHtml(`
             <div data-toggle-name="test"></div>
             <button data-toggle-target="test"></button>
         `);
@@ -25,13 +25,13 @@ describe('toggle', () => {
         TestUtils.click(button);
 
         // Assert
-        const html = TestUtils.getHtml();
+        const html = TestUtils.getBodyHtml();
         expect(html).toMatchSnapshot();
     });
 
     it('removes hidden class', () => {
         // Arrange
-        TestUtils.setHtml(`
+        TestUtils.setBodyHtml(`
             <div data-toggle-name="test" class="is-hidden"></div>
             <button data-toggle-target="test"></button>
         `);
@@ -42,12 +42,12 @@ describe('toggle', () => {
         TestUtils.click(button);
 
         // Assert
-        expect(TestUtils.getHtml()).toMatchSnapshot();
+        expect(TestUtils.getBodyHtml()).toMatchSnapshot();
     });
 
     it('adds custom class when specified', () => {
         // Arrange
-        TestUtils.setHtml(`
+        TestUtils.setBodyHtml(`
             <div data-toggle-name="test"></div>
             <button data-toggle-target="test" data-toggle-class="toggled"></button>
         `);
@@ -58,12 +58,12 @@ describe('toggle', () => {
         TestUtils.click(button);
 
         // Assert
-        expect(TestUtils.getHtml()).toMatchSnapshot();
+        expect(TestUtils.getBodyHtml()).toMatchSnapshot();
     });
 
     it('removes custom class when specified', () => {
         // Arrange
-        TestUtils.setHtml(`
+        TestUtils.setBodyHtml(`
             <div data-toggle-name="test" class="toggled"></div>
             <button data-toggle-target="test" data-toggle-class="toggled"></button>
         `);
@@ -74,12 +74,12 @@ describe('toggle', () => {
         TestUtils.click(button);
 
         // Assert
-        expect(TestUtils.getHtml()).toMatchSnapshot();
+        expect(TestUtils.getBodyHtml()).toMatchSnapshot();
     });
 
     it('can handle multiple targets', () => {
         // Arrange
-        TestUtils.setHtml(`
+        TestUtils.setBodyHtml(`
             <div data-toggle-name="test"></div>
             <div data-toggle-name="test" class="is-hidden"></div>
             <button data-toggle-target="test"></button>
@@ -91,12 +91,12 @@ describe('toggle', () => {
         TestUtils.click(button);
 
         // Assert
-        expect(TestUtils.getHtml()).toMatchSnapshot();
+        expect(TestUtils.getBodyHtml()).toMatchSnapshot();
     });
 
     it('can handle multiple specified targets', () => {
         // Arrange
-        TestUtils.setHtml(`
+        TestUtils.setBodyHtml(`
             <div data-toggle-name="one" class="is-hidden"></div>
             <div data-toggle-name="two"></div>
             <button data-toggle-target="one two"></button>
@@ -108,7 +108,7 @@ describe('toggle', () => {
         TestUtils.click(button);
 
         // Assert
-        expect(TestUtils.getHtml()).toMatchSnapshot();
+        expect(TestUtils.getBodyHtml()).toMatchSnapshot();
     });
 
 });
@@ -117,7 +117,7 @@ describe('show', () => {
 
     it('does nothing when element is already shown', () => {
         // Arrange
-        TestUtils.setHtml(`
+        TestUtils.setBodyHtml(`
             <div data-toggle-name="test"></div>
             <button data-toggle-target="show:test"></button>
         `);
@@ -128,12 +128,12 @@ describe('show', () => {
         TestUtils.click(button);
 
         // Assert
-        expect(TestUtils.getHtml()).toMatchSnapshot();
+        expect(TestUtils.getBodyHtml()).toMatchSnapshot();
     });
 
     it('removes hidden class', () => {
         // Arrange
-        TestUtils.setHtml(`
+        TestUtils.setBodyHtml(`
             <div data-toggle-name="test" class="is-hidden"></div>
             <button data-toggle-target="show:test"></button>
         `);
@@ -144,12 +144,12 @@ describe('show', () => {
         TestUtils.click(button);
 
         // Assert
-        expect(TestUtils.getHtml()).toMatchSnapshot();
+        expect(TestUtils.getBodyHtml()).toMatchSnapshot();
     });
 
     it('removes custom class', () => {
         // Arrange
-        TestUtils.setHtml(`
+        TestUtils.setBodyHtml(`
             <div data-toggle-name="test" class="toggled"></div>
             <button data-toggle-target="show:test" data-toggle-class="toggled"></button>
         `);
@@ -160,12 +160,12 @@ describe('show', () => {
         TestUtils.click(button);
 
         // Assert
-        expect(TestUtils.getHtml()).toMatchSnapshot();
+        expect(TestUtils.getBodyHtml()).toMatchSnapshot();
     });
 
     it('can handle multiple targets', () => {
         // Arrange
-        TestUtils.setHtml(`
+        TestUtils.setBodyHtml(`
             <div data-toggle-name="test"></div>
             <div data-toggle-name="test" class="is-hidden"></div>
             <button data-toggle-target="show:test"></button>
@@ -177,12 +177,12 @@ describe('show', () => {
         TestUtils.click(button);
 
         // Assert
-        expect(TestUtils.getHtml()).toMatchSnapshot();
+        expect(TestUtils.getBodyHtml()).toMatchSnapshot();
     });
 
     it('can handle multiple specified targets', () => {
         // Arrange
-        TestUtils.setHtml(`
+        TestUtils.setBodyHtml(`
             <div data-toggle-name="one" class="is-hidden"></div>
             <div data-toggle-name="two" class="is-hidden"></div>
             <button data-toggle-target="show:one show:two"></button>
@@ -194,7 +194,7 @@ describe('show', () => {
         TestUtils.click(button);
 
         // Assert
-        expect(TestUtils.getHtml()).toMatchSnapshot();
+        expect(TestUtils.getBodyHtml()).toMatchSnapshot();
     });
 
 });
@@ -203,7 +203,7 @@ describe('hide', () => {
 
     it('does nothing when element is already hidden', () => {
         // Arrange
-        TestUtils.setHtml(`
+        TestUtils.setBodyHtml(`
             <div data-toggle-name="test" class="is-hidden"></div>
             <button data-toggle-target="hide:test"></button>
         `);
@@ -214,12 +214,12 @@ describe('hide', () => {
         TestUtils.click(button);
 
         // Assert
-        expect(TestUtils.getHtml()).toMatchSnapshot();
+        expect(TestUtils.getBodyHtml()).toMatchSnapshot();
     });
 
     it('adds hidden class', () => {
         // Arrange
-        TestUtils.setHtml(`
+        TestUtils.setBodyHtml(`
             <div data-toggle-name="test"></div>
             <button data-toggle-target="hide:test"></button>
         `);
@@ -230,12 +230,12 @@ describe('hide', () => {
         TestUtils.click(button);
 
         // Assert
-        expect(TestUtils.getHtml()).toMatchSnapshot();
+        expect(TestUtils.getBodyHtml()).toMatchSnapshot();
     });
 
     it('adds custom class', () => {
         // Arrange
-        TestUtils.setHtml(`
+        TestUtils.setBodyHtml(`
             <div data-toggle-name="test"></div>
             <button data-toggle-target="hide:test" data-toggle-class="toggled"></button>
         `);
@@ -246,12 +246,12 @@ describe('hide', () => {
         TestUtils.click(button);
 
         // Assert
-        expect(TestUtils.getHtml()).toMatchSnapshot();
+        expect(TestUtils.getBodyHtml()).toMatchSnapshot();
     });
 
     it('can handle multiple targets', () => {
         // Arrange
-        TestUtils.setHtml(`
+        TestUtils.setBodyHtml(`
             <div data-toggle-name="test"></div>
             <div data-toggle-name="test" class="is-hidden"></div>
             <button data-toggle-target="hide:test"></button>
@@ -263,12 +263,12 @@ describe('hide', () => {
         TestUtils.click(button);
 
         // Assert
-        expect(TestUtils.getHtml()).toMatchSnapshot();
+        expect(TestUtils.getBodyHtml()).toMatchSnapshot();
     });
 
     it('can handle multiple specified targets', () => {
         // Arrange
-        TestUtils.setHtml(`
+        TestUtils.setBodyHtml(`
             <div data-toggle-name="one"></div>
             <div data-toggle-name="two"></div>
             <button data-toggle-target="hide:one hide:two"></button>
@@ -280,7 +280,7 @@ describe('hide', () => {
         TestUtils.click(button);
 
         // Assert
-        expect(TestUtils.getHtml()).toMatchSnapshot();
+        expect(TestUtils.getBodyHtml()).toMatchSnapshot();
     });
 
 });
@@ -289,7 +289,7 @@ describe('mixed toggles', () => {
 
     it('shows and hides elements correctly', () => {
         // Arrange
-        TestUtils.setHtml(`
+        TestUtils.setBodyHtml(`
             <div data-toggle-name="one"></div>
             <div data-toggle-name="two" class="is-hidden"></div>
             <div data-toggle-name="three" class="is-hidden"></div>
@@ -303,7 +303,7 @@ describe('mixed toggles', () => {
         TestUtils.click(button);
 
         // Assert
-        expect(TestUtils.getHtml()).toMatchSnapshot();
+        expect(TestUtils.getBodyHtml()).toMatchSnapshot();
     });
 
 });
-Original file line number
+Diff line change
@@ Expand Up / @@ -75,7 +75,7 @@ const setupToggle = () => { @@
                 });
             });
-    }
+    };
     ready(() => {
@@ Expand Down @@