From 4b027f015d5ce55d94ad09219989328c0bf88215 Mon Sep 17 00:00:00 2001
From: Juan Ferrer Toribio <juan@verdnatura.es>
Date: Fri, 15 Feb 2019 15:23:39 +0100
Subject: [PATCH 1/2] Pull request: test 1

---
 front/salix/index.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/front/salix/index.js b/front/salix/index.js
index 6788bae07..269fba65d 100644
--- a/front/salix/index.js
+++ b/front/salix/index.js
@@ -2,3 +2,5 @@ import './module';
 import './routes';
 import './components';
 import './styles';
+
+// XXX: Pull request: Test 1

From 3a560446347df6206252a2ca745f3a3038927bca Mon Sep 17 00:00:00 2001
From: Juan Ferrer Toribio <juan@verdnatura.es>
Date: Sun, 17 Feb 2019 18:35:29 +0100
Subject: [PATCH 2/2] Jenkinsfile fixes

---
 Jenkinsfile          | 26 +++++++++++++-------------
 front/salix/index.js |  2 +-
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 9ae65863d..450861086 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -28,9 +28,6 @@ pipeline {
                         case 'test':
                             env.PORT = 5001
                             break
-                        case 'test':
-                            env.PORT = 5000
-                            break
                     }
                     switch (env.BRANCH_NAME) {
                         case 'master':
@@ -39,7 +36,7 @@ pipeline {
                         case 'test':
                             env.NODE_ENV = 'test'
                             break
-                        case 'dev':
+                        default:
                             env.NODE_ENV = 'development'
                             break
                     }
@@ -59,9 +56,10 @@ pipeline {
             }
         }
         stage('Test') {
-            when {
-                branch 'dev'
-            }
+            when { not { anyOf {
+                branch 'test'
+                branch 'master'
+            }}}
             environment {
                 NODE_ENV = ""
                 FIREFOX_BIN = "/opt/firefox/firefox-bin"
@@ -75,9 +73,10 @@ pipeline {
             }
         }
         stage('Build') {
-            when {
-                not { branch 'dev' }
-            }
+            when { anyOf {
+                branch 'test'
+                branch 'master'
+            }}
             environment {
                 CREDS = credentials('docker-registry')
             }
@@ -92,9 +91,10 @@ pipeline {
             }
         }
         stage('Deploy') {
-            when {
-                not { branch 'dev' }
-            }
+            when { anyOf {
+                branch 'test'
+                branch 'master'
+            }}
             environment {
                 DOCKER_TLS_VERIFY = 1
             }
diff --git a/front/salix/index.js b/front/salix/index.js
index 269fba65d..67e4505a4 100644
--- a/front/salix/index.js
+++ b/front/salix/index.js
@@ -3,4 +3,4 @@ import './routes';
 import './components';
 import './styles';
 
-// XXX: Pull request: Test 1
+// XXX: Pull request: Test 2