From 2581421527f5f38de9c6c355582827fbfa201a97 Mon Sep 17 00:00:00 2001
From: codejam <42398485+codejamtc@users.noreply.github.com>
Date: Tue, 12 Jan 2021 13:11:06 +0530
Subject: [PATCH 1/6] Add unit test to the circleci conf file

---
 .circleci/config.yml                           | 4 +++-
 src/test/jmeter/15UV Ultimate Thread-Group.jmx | 4 ++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d47e9423..ddcddb9d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -40,7 +40,7 @@ deploy_steps: &deploy_steps
         ./master_deploy.sh -d ECS -e $DEPLOY_ENV -t latest -s ${LOGICAL_ENV}-global-appvar,${LOGICAL_ENV}-${APPNAME}-appvar -i ${APPNAME}
 
 jobs:
-  test:
+  UnitTests:
     docker:
       - image: circleci/node:12.16.1
       - image: circleci/postgres:9.6.2-alpine
@@ -144,6 +144,8 @@ workflows:
   version: 2
   Connect Project Services:
     jobs:
+      - UnitTests:
+          context : org-global
       - deployDev:
           context : org-global
           filters:
diff --git a/src/test/jmeter/15UV Ultimate Thread-Group.jmx b/src/test/jmeter/15UV Ultimate Thread-Group.jmx
index 2135f040..fb616889 100644
--- a/src/test/jmeter/15UV Ultimate Thread-Group.jmx	
+++ b/src/test/jmeter/15UV Ultimate Thread-Group.jmx	
@@ -204,6 +204,10 @@ start up time/ramp-up time = Shutdown time/ramp-down time of the previous record
               </collectionProp>
             </HeaderManager>
             <hashTree/>
+            <DurationAssertion guiclass="DurationAssertionGui" testclass="DurationAssertion" testname="Duration Assertion" enabled="true">
+              <stringProp name="DurationAssertion.duration">100</stringProp>
+            </DurationAssertion>
+            <hashTree/>
           </hashTree>
           <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Access Projects" enabled="true">
             <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">

From c0599abde4796e39cb31f915a22f8713caa03093 Mon Sep 17 00:00:00 2001
From: codejam <42398485+codejamtc@users.noreply.github.com>
Date: Tue, 12 Jan 2021 13:12:41 +0530
Subject: [PATCH 2/6] Update config.yml

---
 .circleci/config.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index ddcddb9d..04dd7aa2 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -148,6 +148,8 @@ workflows:
           context : org-global
       - deployDev:
           context : org-global
+           requires:
+            - UnitTests
           filters:
             branches:
               only: ['develop', 'connect-performance-testing']

From 743ef07f44af908ae92cbb0d50029087bc4d5b73 Mon Sep 17 00:00:00 2001
From: codejam <42398485+codejamtc@users.noreply.github.com>
Date: Tue, 12 Jan 2021 13:16:56 +0530
Subject: [PATCH 3/6] Update config.yml

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 04dd7aa2..ee92fffd 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -148,7 +148,7 @@ workflows:
           context : org-global
       - deployDev:
           context : org-global
-           requires:
+          requires:
             - UnitTests
           filters:
             branches:

From 41c04d3673afeb1a77c57c18bf7819ba5501e7e9 Mon Sep 17 00:00:00 2001
From: codejam <42398485+codejamtc@users.noreply.github.com>
Date: Tue, 12 Jan 2021 13:20:03 +0530
Subject: [PATCH 4/6] Update config.yml

---
 .circleci/config.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index ee92fffd..994ee4b0 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -40,7 +40,7 @@ deploy_steps: &deploy_steps
         ./master_deploy.sh -d ECS -e $DEPLOY_ENV -t latest -s ${LOGICAL_ENV}-global-appvar,${LOGICAL_ENV}-${APPNAME}-appvar -i ${APPNAME}
 
 jobs:
-  UnitTests:
+  test:
     docker:
       - image: circleci/node:12.16.1
       - image: circleci/postgres:9.6.2-alpine
@@ -144,12 +144,12 @@ workflows:
   version: 2
   Connect Project Services:
     jobs:
-      - UnitTests:
+      - test:
           context : org-global
       - deployDev:
           context : org-global
           requires:
-            - UnitTests
+            - test
           filters:
             branches:
               only: ['develop', 'connect-performance-testing']

From cbbc13fa586a0018e3357a72f45fe8cfbe67a890 Mon Sep 17 00:00:00 2001
From: codejam <42398485+codejamtc@users.noreply.github.com>
Date: Tue, 12 Jan 2021 13:42:55 +0530
Subject: [PATCH 5/6] Update config.yml

---
 .circleci/config.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 994ee4b0..57dc0518 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -155,6 +155,8 @@ workflows:
               only: ['develop', 'connect-performance-testing']
       - deployProd:
           context : org-global
+          requires:
+            - test
           filters:
             branches:
               only: ['master']       

From 8c062b8e4d20b0b11603c96ea11916794ccb1a87 Mon Sep 17 00:00:00 2001
From: codejam <42398485+codejamtc@users.noreply.github.com>
Date: Tue, 12 Jan 2021 13:47:31 +0530
Subject: [PATCH 6/6] Update config.yml

---
 .circleci/config.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 57dc0518..0be8e121 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -40,7 +40,7 @@ deploy_steps: &deploy_steps
         ./master_deploy.sh -d ECS -e $DEPLOY_ENV -t latest -s ${LOGICAL_ENV}-global-appvar,${LOGICAL_ENV}-${APPNAME}-appvar -i ${APPNAME}
 
 jobs:
-  test:
+  UnitTests:
     docker:
       - image: circleci/node:12.16.1
       - image: circleci/postgres:9.6.2-alpine
@@ -144,19 +144,19 @@ workflows:
   version: 2
   Connect Project Services:
     jobs:
-      - test:
+      - UnitTests:
           context : org-global
       - deployDev:
           context : org-global
           requires:
-            - test
+            - UnitTests
           filters:
             branches:
               only: ['develop', 'connect-performance-testing']
       - deployProd:
           context : org-global
           requires:
-            - test
+            - UnitTests
           filters:
             branches:
               only: ['master']