From 5e81d2098e91c8bfc2106d7facf7e8da480acdd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tjitse=20Efd=C3=A9?= <tjitse@vendic.nl>
Date: Sun, 9 Jun 2019 16:46:28 +0200
Subject: [PATCH 1/5] Remove duplication from Travis config

---
 .travis.yml | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b78331b662..07798f84ea 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,26 +11,33 @@ install:
 
 jobs:
   include:
+    - &build
     - stage: Build
       script:
         - yarn lint
         - yarn build
-      node_js: "8"
-    - script:
-        - yarn lint
-        - yarn build
       node_js: "10"
 
+    - <<: *build
+        node_js: '8'
+
+    - &unit
     - stage: Tests
       script: yarn test:unit
-      name: "Unit Tests NodeJS 8"
-      node_js: "8"
-    - script: yarn test:unit
-      name: "Unit Tests NodeJS 10"
+      name: "Unit Tests"
       node_js: "10"
+
+    - <<: *unit
+      node_js: "8"
+
+    - &installer
     - script: yarn installer:ci
-      name: "E2E Tests"
+      name: "Installer test"
       if: branch IN (master, develop)
-      node_js: "8"
+      node_js: "10"
       addons:
         chrome: stable
+
+    - <<: *installer
+      node_js: "8"
+

From 856b64397a35810d73d1124efbc5d8b75329c4d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tjitse=20Efd=C3=A9?= <tjitse@vendic.nl>
Date: Sun, 9 Jun 2019 21:20:48 +0200
Subject: [PATCH 2/5] Fix typo in Travis config

---
 .travis.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 07798f84ea..e869280f1e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,17 +12,17 @@ install:
 jobs:
   include:
     - &build
-    - stage: Build
+      stage: Build
       script:
         - yarn lint
         - yarn build
       node_js: "10"
 
     - <<: *build
-        node_js: '8'
+      node_js: '8'
 
     - &unit
-    - stage: Tests
+      stage: Tests
       script: yarn test:unit
       name: "Unit Tests"
       node_js: "10"
@@ -31,7 +31,7 @@ jobs:
       node_js: "8"
 
     - &installer
-    - script: yarn installer:ci
+      script: yarn installer:ci
       name: "Installer test"
       if: branch IN (master, develop)
       node_js: "10"

From ca0da61d5d3ffb8fb9621728a04e9196a1cd413b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tjitse=20Efd=C3=A9?= <tjitse@vendic.nl>
Date: Sun, 9 Jun 2019 21:25:19 +0200
Subject: [PATCH 3/5] Testing installer stage

---
 .travis.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e869280f1e..391699355d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,20 +24,22 @@ jobs:
     - &unit
       stage: Tests
       script: yarn test:unit
-      name: "Unit Tests"
+      name: "NodeJS 10 unit Tests"
       node_js: "10"
 
     - <<: *unit
+      name: "NodeJS 8 unit Tests"
       node_js: "8"
 
     - &installer
       script: yarn installer:ci
-      name: "Installer test"
-      if: branch IN (master, develop)
+      name: "NodeJS 10 installer test"
+      if: branch IN (master, develop, feature/refactor-travis)
       node_js: "10"
       addons:
         chrome: stable
 
     - <<: *installer
+      name: "NodeJS 8 installer test"
       node_js: "8"
 

From 2b0e8fd474b493b39627a0f9a02269486a1de339 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tjitse=20Efd=C3=A9?= <tjitse@vendic.nl>
Date: Sun, 9 Jun 2019 21:27:45 +0200
Subject: [PATCH 4/5] Corrected naming, finshed testing installer stage

---
 .travis.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 391699355d..9be62fd921 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,19 +22,19 @@ jobs:
       node_js: '8'
 
     - &unit
-      stage: Tests
+      stage: Test
       script: yarn test:unit
-      name: "NodeJS 10 unit Tests"
+      name: "NodeJS 10 unit tests"
       node_js: "10"
 
     - <<: *unit
-      name: "NodeJS 8 unit Tests"
+      name: "NodeJS 8 unit tests"
       node_js: "8"
 
     - &installer
       script: yarn installer:ci
       name: "NodeJS 10 installer test"
-      if: branch IN (master, develop, feature/refactor-travis)
+      if: branch IN (master, develop)
       node_js: "10"
       addons:
         chrome: stable

From a88dc510f0c2087ccd45bccecdf217c2c0c5f8ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tjitse=20Efd=C3=A9?= <tjitse@vendic.nl>
Date: Sun, 9 Jun 2019 21:36:02 +0200
Subject: [PATCH 5/5] Added PR #3035 to changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c793632da6..b30e58ec8e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -86,6 +86,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Extra space if not found products in everything new section home page - @cnviradiya (#2846)
 - Load custom fonts without webfont.js - @jahvi (#2944)
 - Added some structured data to product page - @cewald (#2910)
+- Refactored Travis config @Tjitse-E (#3035)
 
 ## [1.9.1] - 2019.05.27