Merge branch 'master' into fix/eslint-valid-jsdoc

SAP · Jan 15, 2019 · c18d6d8 · c18d6d8
2 parents bf71960 + 7d001f6
commit c18d6d8
Show file tree

Hide file tree

Showing 57 changed files with 10,793 additions and 10,182 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -18,7 +18,7 @@ plugins:
     - react
 
 rules:
-    #brace-style: 2
+    brace-style: 2
     camelcase: 2
     comma-dangle: [2, 'never']
     comma-spacing: 2
@@ -27,7 +27,7 @@ rules:
     default-case: 2
     dot-notation: 2
     eol-last: 2
-    #eqeqeq: 2
+    eqeqeq: 2
     guard-for-in: 2
     handle-callback-err: 2
     ie11/no-collection-args: 2

diff --git a/.travis.yml b/.travis.yml
@@ -9,7 +9,7 @@ script:
 jobs:
   include:
   - stage: "Fundamental-react: Test & Lint"
-    script: npm run lint && npm run test:coverage
+    script: npm run lint && npm run test:coveralls
   - stage: Deploy
     if: branch = master AND type != pull_request
     before_deploy:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,31 +2,137 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
-<a name="0.0.14"></a>
-## [0.0.14](http://sap.github.io/fundamental-react/compare/v0.0.13...v0.0.14) (2019-01-09)
+<a name="0.0.15-rc.17"></a>
+## [0.0.15-rc.17](http://sap.github.io/fundamental-react/compare/v0.0.15-rc.16...v0.0.15-rc.17) (2019-01-15)
+
+
+
+<a name="0.0.15-rc.16"></a>
+## [0.0.15-rc.16](http://sap.github.io/fundamental-react/compare/v0.0.15-rc.15...v0.0.15-rc.16) (2019-01-15)
+
+
+### Bug Fixes
+
+* add fundamental bot to release script ([#194](http://sap.github.io/fundamental-react/issues/194)) ([96e3080](http://sap.github.io/fundamental-react/commit/96e3080))
+
+
+
+<a name="0.0.15-rc.15"></a>
+## [0.0.15-rc.15](http://sap.github.io/fundamental-react/compare/v0.0.15-rc.14...v0.0.15-rc.15) (2019-01-15)
+
+
+### Bug Fixes
+
+* update components to use arrow function syntax ([#172](http://sap.github.io/fundamental-react/issues/172)) ([f7aa1aa](http://sap.github.io/fundamental-react/commit/f7aa1aa))
+
+
+
+<a name="0.0.15-rc.14"></a>
+## [0.0.15-rc.14](http://sap.github.io/fundamental-react/compare/v0.0.15-rc.13...v0.0.15-rc.14) (2019-01-14)
+
+
+### Bug Fixes
+
+* enable eslint rule brace style ([#180](http://sap.github.io/fundamental-react/issues/180)) ([7ca2a47](http://sap.github.io/fundamental-react/commit/7ca2a47))
+
+
+
+<a name="0.0.15-rc.13"></a>
+## [0.0.15-rc.13](http://sap.github.io/fundamental-react/compare/v0.0.15-rc.12...v0.0.15-rc.13) (2019-01-14)
+
+
+### Bug Fixes
+
+* enable eslint strict equality (eqeqeq) ([01cc3a4](http://sap.github.io/fundamental-react/commit/01cc3a4))
+
+
+
+<a name="0.0.15-rc.12"></a>
+## [0.0.15-rc.12](http://sap.github.io/fundamental-react/compare/v0.0.15-rc.11...v0.0.15-rc.12) (2019-01-14)
+
+
+### Bug Fixes
+
+* add code coverage tracking with coveralls ([#176](http://sap.github.io/fundamental-react/issues/176)) ([7d596ef](http://sap.github.io/fundamental-react/commit/7d596ef))
+
+
+
+<a name="0.0.15-rc.11"></a>
+## [0.0.15-rc.11](http://sap.github.io/fundamental-react/compare/v0.0.15-rc.10...v0.0.15-rc.11) (2019-01-14)
+
+
+### Bug Fixes
+
+* testing travis with branch protection - Restrict who can push to matching branches ([789b0d8](http://sap.github.io/fundamental-react/commit/789b0d8))
+
+
+
+<a name="0.0.15-rc.10"></a>
+## [0.0.15-rc.10](http://sap.github.io/fundamental-react/compare/v0.0.15-rc.9...v0.0.15-rc.10) (2019-01-14)
+
+
+### Bug Fixes
+
+* testing with travis branch protections required ([a1f68e7](http://sap.github.io/fundamental-react/commit/a1f68e7))
+
+
+
+<a name="0.0.15-rc.9"></a>
+## [0.0.15-rc.9](http://sap.github.io/fundamental-react/compare/v0.0.15-rc.8...v0.0.15-rc.9) (2019-01-14)
+
+
+### Bug Fixes
+
+* testing with required approver ([7328061](http://sap.github.io/fundamental-react/commit/7328061))
+
+
+
+<a name="0.0.15-rc.8"></a>
+## [0.0.15-rc.8](http://sap.github.io/fundamental-react/compare/v0.0.15-rc.7...v0.0.15-rc.8) (2019-01-14)
+
+
+### Bug Fixes
+
+* remove newline on readme ([c30c59b](http://sap.github.io/fundamental-react/commit/c30c59b))
+
+
+
+<a name="0.0.15-rc.7"></a>
+## [0.0.15-rc.7](http://sap.github.io/fundamental-react/compare/v0.0.15-rc.6...v0.0.15-rc.7) (2019-01-14)
+
+
+### Bug Fixes
+
+* testing with branch protections ([a89eab7](http://sap.github.io/fundamental-react/commit/a89eab7))
+
+
+
+<a name="0.0.15-rc.6"></a>
+## [0.0.15-rc.6](http://sap.github.io/fundamental-react/compare/v0.0.13...v0.0.15-rc.6) (2019-01-14)
 
 
 ### Bug Fixes
 
 * add pack PR limiter ([#155](http://sap.github.io/fundamental-react/issues/155)) ([269a646](http://sap.github.io/fundamental-react/commit/269a646))
 * add standard-version to package.json ([#153](http://sap.github.io/fundamental-react/issues/153)) ([c70509b](http://sap.github.io/fundamental-react/commit/c70509b))
-* merge conflicts ([#157](http://sap.github.io/fundamental-react/issues/157)) ([59c0864](http://sap.github.io/fundamental-react/commit/59c0864))
+* automate versioning and publishing to npm (rc-version) ([#165](http://sap.github.io/fundamental-react/issues/165)) ([3e76aad](http://sap.github.io/fundamental-react/commit/3e76aad))
 * move deploy to jobs ([#149](http://sap.github.io/fundamental-react/issues/149)) ([ac956d6](http://sap.github.io/fundamental-react/commit/ac956d6))
+* removing automation centered on development branch ([1391fd8](http://sap.github.io/fundamental-react/commit/1391fd8))
+* update webpack-dev-server to non-vulnerable version ([#168](http://sap.github.io/fundamental-react/issues/168)) ([585eaf5](http://sap.github.io/fundamental-react/commit/585eaf5))
+* Updating Dependencies ([#163](http://sap.github.io/fundamental-react/issues/163)) ([7b387e1](http://sap.github.io/fundamental-react/commit/7b387e1))
 
 
 
-<a name="0.0.8"></a>
-## [0.0.8](http://sap.github.io/fundamental-react/compare/v0.0.7...v0.0.8) (2018-12-21)
+<a name="0.0.14"></a>
+## [0.0.14](http://sap.github.io/fundamental-react/compare/v0.0.13...v0.0.14) (2019-01-09)
 
 
 ### Bug Fixes
 
-* Add Polyfill for IE11 support ([#117](http://sap.github.io/fundamental-react/issues/117)) ([3181e54](http://sap.github.io/fundamental-react/commit/3181e54))
-* cleanup package ([#116](http://sap.github.io/fundamental-react/issues/116)) ([6b35aaf](http://sap.github.io/fundamental-react/commit/6b35aaf))
-* eject from create react app; prep for linting ([#107](http://sap.github.io/fundamental-react/issues/107)) ([86329df](http://sap.github.io/fundamental-react/commit/86329df))
-* init coverage ([#119](http://sap.github.io/fundamental-react/issues/119)) ([fbb4b08](http://sap.github.io/fundamental-react/commit/fbb4b08))
-* init linting ([#106](http://sap.github.io/fundamental-react/issues/106)) ([e31570f](http://sap.github.io/fundamental-react/commit/e31570f))
-* move lint extend react-app to eslintrc. comment out due to failing rules ([#118](http://sap.github.io/fundamental-react/issues/118)) ([b2a4ac7](http://sap.github.io/fundamental-react/commit/b2a4ac7))
+* add pack PR limiter ([#155](http://sap.github.io/fundamental-react/issues/155)) ([269a646](http://sap.github.io/fundamental-react/commit/269a646))
+* add standard-version to package.json ([#153](http://sap.github.io/fundamental-react/issues/153)) ([c70509b](http://sap.github.io/fundamental-react/commit/c70509b))
+* merge conflicts ([#157](http://sap.github.io/fundamental-react/issues/157)) ([59c0864](http://sap.github.io/fundamental-react/commit/59c0864))
+* move deploy to jobs ([#149](http://sap.github.io/fundamental-react/issues/149)) ([ac956d6](http://sap.github.io/fundamental-react/commit/ac956d6))
 
 
 
@@ -43,3 +149,16 @@ All notable changes to this project will be documented in this file. See [standa
 * merge develop into master ([#151](http://sap.github.io/fundamental-react/issues/151)) ([9d7768c](http://sap.github.io/fundamental-react/commit/9d7768c)), closes [#107](http://sap.github.io/fundamental-react/issues/107) [#116](http://sap.github.io/fundamental-react/issues/116) [#106](http://sap.github.io/fundamental-react/issues/106) [#117](http://sap.github.io/fundamental-react/issues/117) [#119](http://sap.github.io/fundamental-react/issues/119) [#118](http://sap.github.io/fundamental-react/issues/118) [#120](http://sap.github.io/fundamental-react/issues/120) [Issue#121](http://sap.github.io/fundamental-react/issues/121) [#122](http://sap.github.io/fundamental-react/issues/122) [Issue#90](http://sap.github.io/fundamental-react/issues/90) [#123](http://sap.github.io/fundamental-react/issues/123) [Issue#90](http://sap.github.io/fundamental-react/issues/90) [Issue#90](http://sap.github.io/fundamental-react/issues/90) [#127](http://sap.github.io/fundamental-react/issues/127) [#131](http://sap.github.io/fundamental-react/issues/131) [Feature/issue#93](http://sap.github.io/fundamental-react/issues/93) [#129](http://sap.github.io/fundamental-react/issues/129) [Issue#93](http://sap.github.io/fundamental-react/issues/93) [Issue#93](http://sap.github.io/fundamental-react/issues/93) [Issue#93](http://sap.github.io/fundamental-react/issues/93) [Issue#93](http://sap.github.io/fundamental-react/issues/93) [Issue#93](http://sap.github.io/fundamental-react/issues/93) [Issue#93](http://sap.github.io/fundamental-react/issues/93) [Issue#93](http://sap.github.io/fundamental-react/issues/93) [Issue#93](http://sap.github.io/fundamental-react/issues/93) [Issue#93](http://sap.github.io/fundamental-react/issues/93) [#132](http://sap.github.io/fundamental-react/issues/132) [#128](http://sap.github.io/fundamental-react/issues/128) [#133](http://sap.github.io/fundamental-react/issues/133) [#135](http://sap.github.io/fundamental-react/issues/135) [#124](http://sap.github.io/fundamental-react/issues/124) [#124](http://sap.github.io/fundamental-react/issues/124) [#137](http://sap.github.io/fundamental-react/issues/137) [#138](http://sap.github.io/fundamental-react/issues/138) [#136](http://sap.github.io/fundamental-react/issues/136) [#140](http://sap.github.io/fundamental-react/issues/140) [#144](http://sap.github.io/fundamental-react/issues/144) [#146](http://sap.github.io/fundamental-react/issues/146) [#148](http://sap.github.io/fundamental-react/issues/148) [#149](http://sap.github.io/fundamental-react/issues/149)
 * merge develop into master to trigger Travis ([#156](http://sap.github.io/fundamental-react/issues/156)) ([e0b88f6](http://sap.github.io/fundamental-react/commit/e0b88f6)), closes [#107](http://sap.github.io/fundamental-react/issues/107) [#116](http://sap.github.io/fundamental-react/issues/116) [#106](http://sap.github.io/fundamental-react/issues/106) [#117](http://sap.github.io/fundamental-react/issues/117) [#119](http://sap.github.io/fundamental-react/issues/119) [#118](http://sap.github.io/fundamental-react/issues/118) [#120](http://sap.github.io/fundamental-react/issues/120) [Issue#121](http://sap.github.io/fundamental-react/issues/121) [#122](http://sap.github.io/fundamental-react/issues/122) [Issue#90](http://sap.github.io/fundamental-react/issues/90) [#123](http://sap.github.io/fundamental-react/issues/123) [Issue#90](http://sap.github.io/fundamental-react/issues/90) [Issue#90](http://sap.github.io/fundamental-react/issues/90) [#127](http://sap.github.io/fundamental-react/issues/127) [#131](http://sap.github.io/fundamental-react/issues/131) [Feature/issue#93](http://sap.github.io/fundamental-react/issues/93) [#129](http://sap.github.io/fundamental-react/issues/129) [Issue#93](http://sap.github.io/fundamental-react/issues/93) [Issue#93](http://sap.github.io/fundamental-react/issues/93) [Issue#93](http://sap.github.io/fundamental-react/issues/93) [Issue#93](http://sap.github.io/fundamental-react/issues/93) [Issue#93](http://sap.github.io/fundamental-react/issues/93) [Issue#93](http://sap.github.io/fundamental-react/issues/93) [Issue#93](http://sap.github.io/fundamental-react/issues/93) [Issue#93](http://sap.github.io/fundamental-react/issues/93) [Issue#93](http://sap.github.io/fundamental-react/issues/93) [#132](http://sap.github.io/fundamental-react/issues/132) [#128](http://sap.github.io/fundamental-react/issues/128) [#133](http://sap.github.io/fundamental-react/issues/133) [#135](http://sap.github.io/fundamental-react/issues/135) [#124](http://sap.github.io/fundamental-react/issues/124) [#124](http://sap.github.io/fundamental-react/issues/124) [#137](http://sap.github.io/fundamental-react/issues/137) [#138](http://sap.github.io/fundamental-react/issues/138) [#136](http://sap.github.io/fundamental-react/issues/136) [#140](http://sap.github.io/fundamental-react/issues/140) [#144](http://sap.github.io/fundamental-react/issues/144) [#146](http://sap.github.io/fundamental-react/issues/146) [#148](http://sap.github.io/fundamental-react/issues/148) [#149](http://sap.github.io/fundamental-react/issues/149) [#153](http://sap.github.io/fundamental-react/issues/153) [#155](http://sap.github.io/fundamental-react/issues/155)
 * trigger master rebuild ([#152](http://sap.github.io/fundamental-react/issues/152)) ([f4affda](http://sap.github.io/fundamental-react/commit/f4affda)), closes [#107](http://sap.github.io/fundamental-react/issues/107) [#116](http://sap.github.io/fundamental-react/issues/116) [#106](http://sap.github.io/fundamental-react/issues/106) [#117](http://sap.github.io/fundamental-react/issues/117) [#119](http://sap.github.io/fundamental-react/issues/119) [#118](http://sap.github.io/fundamental-react/issues/118) [#120](http://sap.github.io/fundamental-react/issues/120) [Issue#121](http://sap.github.io/fundamental-react/issues/121) [#122](http://sap.github.io/fundamental-react/issues/122) [Issue#90](http://sap.github.io/fundamental-react/issues/90) [#123](http://sap.github.io/fundamental-react/issues/123) [Issue#90](http://sap.github.io/fundamental-react/issues/90) [Issue#90](http://sap.github.io/fundamental-react/issues/90) [#127](http://sap.github.io/fundamental-react/issues/127) [#131](http://sap.github.io/fundamental-react/issues/131) [Feature/issue#93](http://sap.github.io/fundamental-react/issues/93) [#129](http://sap.github.io/fundamental-react/issues/129) [Issue#93](http://sap.github.io/fundamental-react/issues/93) [Issue#93](http://sap.github.io/fundamental-react/issues/93) [Issue#93](http://sap.github.io/fundamental-react/issues/93) [Issue#93](http://sap.github.io/fundamental-react/issues/93) [Issue#93](http://sap.github.io/fundamental-react/issues/93) [Issue#93](http://sap.github.io/fundamental-react/issues/93) [Issue#93](http://sap.github.io/fundamental-react/issues/93) [Issue#93](http://sap.github.io/fundamental-react/issues/93) [Issue#93](http://sap.github.io/fundamental-react/issues/93) [#132](http://sap.github.io/fundamental-react/issues/132) [#128](http://sap.github.io/fundamental-react/issues/128) [#133](http://sap.github.io/fundamental-react/issues/133) [#135](http://sap.github.io/fundamental-react/issues/135) [#124](http://sap.github.io/fundamental-react/issues/124) [#124](http://sap.github.io/fundamental-react/issues/124) [#137](http://sap.github.io/fundamental-react/issues/137) [#138](http://sap.github.io/fundamental-react/issues/138) [#136](http://sap.github.io/fundamental-react/issues/136) [#140](http://sap.github.io/fundamental-react/issues/140) [#144](http://sap.github.io/fundamental-react/issues/144) [#146](http://sap.github.io/fundamental-react/issues/146) [#148](http://sap.github.io/fundamental-react/issues/148) [#149](http://sap.github.io/fundamental-react/issues/149)
+
+<a name="0.0.8"></a>
+## [0.0.8](http://sap.github.io/fundamental-react/compare/v0.0.7...v0.0.8) (2018-12-21)
+
+
+### Bug Fixes
+
+* Add Polyfill for IE11 support ([#117](http://sap.github.io/fundamental-react/issues/117)) ([3181e54](http://sap.github.io/fundamental-react/commit/3181e54))
+* cleanup package ([#116](http://sap.github.io/fundamental-react/issues/116)) ([6b35aaf](http://sap.github.io/fundamental-react/commit/6b35aaf))
+* eject from create react app; prep for linting ([#107](http://sap.github.io/fundamental-react/issues/107)) ([86329df](http://sap.github.io/fundamental-react/commit/86329df))
+* init coverage ([#119](http://sap.github.io/fundamental-react/issues/119)) ([fbb4b08](http://sap.github.io/fundamental-react/commit/fbb4b08))
+* init linting ([#106](http://sap.github.io/fundamental-react/issues/106)) ([e31570f](http://sap.github.io/fundamental-react/commit/e31570f))
+* move lint extend react-app to eslintrc. comment out due to failing rules ([#118](http://sap.github.io/fundamental-react/issues/118)) ([b2a4ac7](http://sap.github.io/fundamental-react/commit/b2a4ac7))
diff --git a/README.md b/README.md
@@ -1,5 +1,6 @@
 [![npm version](https://badge.fury.io/js/fundamental-react.svg)](//www.npmjs.com/package/fundamental-react)
 [![Build Status](https://travis-ci.org/SAP/fundamental-react.svg?branch=master)](https://travis-ci.org/SAP/fundamental-react)
+[![Coverage Status](https://coveralls.io/repos/github/SAP/fundamental-react/badge.svg?branch=master)](https://coveralls.io/github/SAP/fundamental-react?branch=master)
 
 ## Description
 

diff --git a/ci-scripts/publish.sh b/ci-scripts/publish.sh
@@ -1,7 +1,7 @@
 #! /bin/bash
 
 # publish releases (already tagged by publish_release.sh)
-if [[ "$TRAVIS_COMMIT_MESSAGE" =~ chore\(release\):\sversion\s[0-9]+\.[0-9]+\.[0-9]+$.* ]]; then
+if [[ "$TRAVIS_COMMIT_MESSAGE" =~ chore\(release\):[[:space:]]version[[:space:]][0-9]+\.[0-9]+\.[0-9]+$.* ]]; then
     npm publish
 # bump and publish rc
 else
@@ -11,13 +11,9 @@ else
     git checkout master
     # update the package verion and commit to the git repository
     npm run std-version -- --prerelease rc --no-verify
-
-    echo "$TRAVIS_BRANCH"
-    git status
+
     # pushes changes to master
     git push --verbose --follow-tags "https://$GH_TOKEN@github.com/$TRAVIS_REPO_SLUG" "$TRAVIS_BRANCH" > /dev/null 2>&1;
 
-    git status
-
     npm publish --tag prerelease
 fi
diff --git a/ci-scripts/publish_release.sh b/ci-scripts/publish_release.sh
@@ -25,5 +25,14 @@ hash_upstream=$(git rev-parse $git_branch@{upstream})
 
 set -o errexit
 
+githubEmail=`git config --get user.email`
+githubName=`git config --get user.name`
+
+git config --global user.email "fundamental@sap.com"
+git config --global user.name "fundamental-bot"
+
 npm run std-version:release
 git push --follow-tags origin
+
+git config --global user.email "$githubEmail"
+git config --global user.name "$githubName"
diff --git a/config/jest/jest.config.js b/config/jest/jest.config.js
@@ -0,0 +1,4 @@
+import Adapter from 'enzyme-adapter-react-16';
+import { configure } from 'enzyme';
+
+configure({ adapter: new Adapter() });