From f527bbb748043ecbbcbb14eefb718f0e4f5a0e89 Mon Sep 17 00:00:00 2001 From: Tom Bloor Date: Wed, 13 Sep 2017 17:42:09 +0100 Subject: [PATCH 1/5] Added test:once and ci npm commands --- package.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 2eadefd..d9b90a9 100644 --- a/package.json +++ b/package.json @@ -11,8 +11,10 @@ "start": "ng serve", "build": "ng build", "test": "ng test", + "test:once": "ng test --watch=false", "lint": "ng lint", - "e2e": "ng e2e" + "e2e": "ng e2e", + "ci": "npm run test:once && npm run e2e" }, "private": true, "dependencies": { From 280f1b51d53408f2dd420eb2b959545a2e2b0155 Mon Sep 17 00:00:00 2001 From: Tom Bloor Date: Wed, 13 Sep 2017 17:47:39 +0100 Subject: [PATCH 2/5] Added travis config --- .travis.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..a4ae69d --- /dev/null +++ b/.travis.yml @@ -0,0 +1,15 @@ +addons: + apt: + packages: + - google-chrome-stable +language: node_js +node_js: + - 8 +before_script: + - export DISPLAY=:99.0 + - sh -e /etc/init.d/xvfb start + - npm config set spin false +install: + - npm install +script: + - npm run ci From 135fa162589e305462c180bd5638b2c39d7d0ee6 Mon Sep 17 00:00:00 2001 From: Tom Bloor Date: Wed, 13 Sep 2017 17:51:12 +0100 Subject: [PATCH 3/5] use chrome addon instead of apt in travis --- .travis.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index a4ae69d..f262434 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,5 @@ addons: - apt: - packages: - - google-chrome-stable + chrome: stable language: node_js node_js: - 8 From 238fd8cfc8e091449fb551479121d55dc33da7b7 Mon Sep 17 00:00:00 2001 From: Tom Bloor Date: Thu, 14 Sep 2017 11:06:14 +0100 Subject: [PATCH 4/5] Added Travis markings to README --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 88aa6b8..5a603ea 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,10 @@ This is the repository for the LocalLoop web interface, for traders and customers to see and submit data to the service. +| --- | --- | +| *Master:* | [![Build Status](https://travis-ci.org/Pear-Trading/Foodloop-Web.svg?branch=master)](https://travis-ci.org/Pear-Trading/Foodloop-Web) | +| *Development:* | [![Build Status](https://travis-ci.org/Pear-Trading/Foodloop-Web.svg?branch=development)](https://travis-ci.org/Pear-Trading/Foodloop-Web) | + ## Getting Started To get started with development, you will need an up to date version of From df3d7d5fc5c265e790f9fd63ed17758be2f3c47f Mon Sep 17 00:00:00 2001 From: Tom Bloor Date: Thu, 14 Sep 2017 11:07:00 +0100 Subject: [PATCH 5/5] Fixed table in README --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 5a603ea..f0fe372 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,7 @@ This is the repository for the LocalLoop web interface, for traders and customers to see and submit data to the service. +| Branch | Status | | --- | --- | | *Master:* | [![Build Status](https://travis-ci.org/Pear-Trading/Foodloop-Web.svg?branch=master)](https://travis-ci.org/Pear-Trading/Foodloop-Web) | | *Development:* | [![Build Status](https://travis-ci.org/Pear-Trading/Foodloop-Web.svg?branch=development)](https://travis-ci.org/Pear-Trading/Foodloop-Web) |