From 5457d995599863b7f383e0265f1367a777430480 Mon Sep 17 00:00:00 2001
From: Fourat ACHOUR <fourat.achour@sifast.tn>
Date: Mon, 7 Aug 2017 12:05:22 +0100
Subject: [PATCH 01/11] Adding the Gdrive mocha reporter parameter

---
 .travis.yml   |  1 +
 bin/upload.sh | 13 +++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index e5f3945..74ef042 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -42,6 +42,7 @@ before_script:
   - DISPLAY=:10 ./selenium-standalone start &> /dev/null &
   - cd ../../..
   - npm install
+  - npm install mochawesome
   - cd test/itg/$PS_VERSION
   - "/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_10.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :10 -ac -screen 0 1280x1024x16"
   - docker exec prestashop rm -rf /var/www/html/modules/welcome
diff --git a/bin/upload.sh b/bin/upload.sh
index 8141870..f291149 100755
--- a/bin/upload.sh
+++ b/bin/upload.sh
@@ -4,6 +4,19 @@ FIXED_BRANCH=$(echo $TRAVIS_BRANCH | sed 's/\//-/g')
 ARCHIVE=$FIXED_BRANCH-$(date +%Y-%m-%d_%H_%M_%S)-$TRAVIS_COMMIT.tar.bz2
 DIR="test/itg/$PS_VERSION/screenshots"
 
+
+echo "Creating archive $ARCHIVE_REPORTER"
+
+ARCHIVE_REPORTER=$FIXED_BRANCH-$(date +%Y-%m-%d_%H_%M_%S)-$TRAVIS_COMMIT.zip
+
+echo "Creating archive $ARCHIVE_REPORTER"
+
+zip -r $ARCHIVE_REPORTER test/itg/$PS_VERSION/mochawesome-report/*
+
+
+./bin/gdrive-linux-x64 upload --refresh-token $GDRIVE_REFRESH_TOKEN --parent $GDRIVE_DIR "$ARCHIVE_REPORTER"
+
+
 # look for empty dir
 if [ "$(ls -A $DIR)" ]; then
     echo "Creating archive $ARCHIVE"

From f91bb8a6ebf6331ba0bc6daa3b47b3813476b341 Mon Sep 17 00:00:00 2001
From: Fourat ACHOUR <fourat.achour@sifast.tn>
Date: Mon, 7 Aug 2017 12:15:06 +0100
Subject: [PATCH 02/11] Working on upload.sh file

---
 bin/upload.sh | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/bin/upload.sh b/bin/upload.sh
index f291149..456ef7f 100755
--- a/bin/upload.sh
+++ b/bin/upload.sh
@@ -1,22 +1,9 @@
 #!/bin/sh
 
 FIXED_BRANCH=$(echo $TRAVIS_BRANCH | sed 's/\//-/g')
-ARCHIVE=$FIXED_BRANCH-$(date +%Y-%m-%d_%H_%M_%S)-$TRAVIS_COMMIT.tar.bz2
+ARCHIVE=ScreenShot-$FIXED_BRANCH-$(date +%Y-%m-%d_%H_%M_%S)-$TRAVIS_COMMIT.tar.bz2
 DIR="test/itg/$PS_VERSION/screenshots"
 
-
-echo "Creating archive $ARCHIVE_REPORTER"
-
-ARCHIVE_REPORTER=$FIXED_BRANCH-$(date +%Y-%m-%d_%H_%M_%S)-$TRAVIS_COMMIT.zip
-
-echo "Creating archive $ARCHIVE_REPORTER"
-
-zip -r $ARCHIVE_REPORTER test/itg/$PS_VERSION/mochawesome-report/*
-
-
-./bin/gdrive-linux-x64 upload --refresh-token $GDRIVE_REFRESH_TOKEN --parent $GDRIVE_DIR "$ARCHIVE_REPORTER"
-
-
 # look for empty dir
 if [ "$(ls -A $DIR)" ]; then
     echo "Creating archive $ARCHIVE"
@@ -27,4 +14,11 @@ if [ "$(ls -A $DIR)" ]; then
     echo "Finished Google Drive upload"
 else
     echo "$DIR is empty"
-fi
\ No newline at end of file
+fi
+
+
+echo "Creating archive of test report $ARCHIVE_REPORTER"
+ARCHIVE_REPORTER=TestReport-$FIXED_BRANCH-$(date +%Y-%m-%d_%H_%M_%S)-$TRAVIS_COMMIT.zip
+zip -r $ARCHIVE_REPORTER test/itg/$PS_VERSION/mochawesome-report/*
+./bin/gdrive-linux-x64 upload --refresh-token $GDRIVE_REFRESH_TOKEN --parent $GDRIVE_DIR "$ARCHIVE_REPORTER"
+echo "Finished uploading test report"

From d2c4697d4a025c78fa2a86082624de8117632b7c Mon Sep 17 00:00:00 2001
From: Fourat ACHOUR <fourat.achour@sifast.tn>
Date: Mon, 7 Aug 2017 12:21:02 +0100
Subject: [PATCH 03/11] Edit and comment Upload.sh file

---
 bin/upload.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/upload.sh b/bin/upload.sh
index 456ef7f..e84651e 100755
--- a/bin/upload.sh
+++ b/bin/upload.sh
@@ -16,7 +16,7 @@ else
     echo "$DIR is empty"
 fi
 
-
+# uploading mochareporter to Gdrive
 echo "Creating archive of test report $ARCHIVE_REPORTER"
 ARCHIVE_REPORTER=TestReport-$FIXED_BRANCH-$(date +%Y-%m-%d_%H_%M_%S)-$TRAVIS_COMMIT.zip
 zip -r $ARCHIVE_REPORTER test/itg/$PS_VERSION/mochawesome-report/*

From dc9fc27ceaf2ccbe2dd93b277fb80485ffd1d69c Mon Sep 17 00:00:00 2001
From: Fourat ACHOUR <fourat.achour@sifast.tn>
Date: Mon, 7 Aug 2017 14:19:41 +0100
Subject: [PATCH 04/11] Ignore mochawsome report files

---
 .gitignore | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 82bc1a1..9938f9d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,9 @@
 node_modules/*
+test/itg/1.6/mochawesome-report/*
+test/itg/1.7/mochawesome-report/*
 .DS_Store
 .idea/*
 **/screenshots
 **.log
 **/mochawesome-report
-email_sender/test_report_*.html
\ No newline at end of file
+email_sender/test_report_*.html

From 823bce94473974f7dfdf9200cb9c6d610d065852 Mon Sep 17 00:00:00 2001
From: Fourat ACHOUR <fourat.achour@sifast.tn>
Date: Mon, 7 Aug 2017 12:05:22 +0100
Subject: [PATCH 05/11] Rename the files that goes to google drive

---
 bin/upload.sh | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/bin/upload.sh b/bin/upload.sh
index e84651e..abfa951 100755
--- a/bin/upload.sh
+++ b/bin/upload.sh
@@ -4,6 +4,19 @@ FIXED_BRANCH=$(echo $TRAVIS_BRANCH | sed 's/\//-/g')
 ARCHIVE=ScreenShot-$FIXED_BRANCH-$(date +%Y-%m-%d_%H_%M_%S)-$TRAVIS_COMMIT.tar.bz2
 DIR="test/itg/$PS_VERSION/screenshots"
 
+
+echo "Creating archive $ARCHIVE_REPORTER"
+
+ARCHIVE_REPORTER=$FIXED_BRANCH-$(date +%Y-%m-%d_%H_%M_%S)-$TRAVIS_COMMIT.zip
+
+echo "Creating archive $ARCHIVE_REPORTER"
+
+zip -r $ARCHIVE_REPORTER test/itg/$PS_VERSION/mochawesome-report/*
+
+
+./bin/gdrive-linux-x64 upload --refresh-token $GDRIVE_REFRESH_TOKEN --parent $GDRIVE_DIR "$ARCHIVE_REPORTER"
+
+
 # look for empty dir
 if [ "$(ls -A $DIR)" ]; then
     echo "Creating archive $ARCHIVE"

From 5c2214a93c9a7d49e729f0e0d596094cf03fca89 Mon Sep 17 00:00:00 2001
From: fouratachour <fourat.ach@gmail.com>
Date: Wed, 13 Sep 2017 12:14:28 +0100
Subject: [PATCH 06/11] Change the contents of the compressed file

---
 bin/upload.sh | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/bin/upload.sh b/bin/upload.sh
index abfa951..e84651e 100755
--- a/bin/upload.sh
+++ b/bin/upload.sh
@@ -4,19 +4,6 @@ FIXED_BRANCH=$(echo $TRAVIS_BRANCH | sed 's/\//-/g')
 ARCHIVE=ScreenShot-$FIXED_BRANCH-$(date +%Y-%m-%d_%H_%M_%S)-$TRAVIS_COMMIT.tar.bz2
 DIR="test/itg/$PS_VERSION/screenshots"
 
-
-echo "Creating archive $ARCHIVE_REPORTER"
-
-ARCHIVE_REPORTER=$FIXED_BRANCH-$(date +%Y-%m-%d_%H_%M_%S)-$TRAVIS_COMMIT.zip
-
-echo "Creating archive $ARCHIVE_REPORTER"
-
-zip -r $ARCHIVE_REPORTER test/itg/$PS_VERSION/mochawesome-report/*
-
-
-./bin/gdrive-linux-x64 upload --refresh-token $GDRIVE_REFRESH_TOKEN --parent $GDRIVE_DIR "$ARCHIVE_REPORTER"
-
-
 # look for empty dir
 if [ "$(ls -A $DIR)" ]; then
     echo "Creating archive $ARCHIVE"

From a307ea969e29797d138f8b086f8efd75e3fca4c2 Mon Sep 17 00:00:00 2001
From: fouratachour <fourat.ach@gmail.com>
Date: Wed, 13 Sep 2017 14:25:16 +0100
Subject: [PATCH 07/11] Rename folder that goes to Gdrive , changing compressed
 directory

---
 bin/upload.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/bin/upload.sh b/bin/upload.sh
index e84651e..be434b8 100755
--- a/bin/upload.sh
+++ b/bin/upload.sh
@@ -18,7 +18,8 @@ fi
 
 # uploading mochareporter to Gdrive
 echo "Creating archive of test report $ARCHIVE_REPORTER"
-ARCHIVE_REPORTER=TestReport-$FIXED_BRANCH-$(date +%Y-%m-%d_%H_%M_%S)-$TRAVIS_COMMIT.zip
-zip -r $ARCHIVE_REPORTER test/itg/$PS_VERSION/mochawesome-report/*
+ARCHIVE_REPORTER=TestReport-$PS_VERSION-$FIXED_BRANCH-$(date +%Y-%m-%d_%H_%M_%S)-$TRAVIS_COMMIT.zip
+cd test/itg/$PS_VERSION/ && \
+zip -r $ARCHIVE_REPORTER mochawesome-report/*
 ./bin/gdrive-linux-x64 upload --refresh-token $GDRIVE_REFRESH_TOKEN --parent $GDRIVE_DIR "$ARCHIVE_REPORTER"
 echo "Finished uploading test report"

From ba3feb4120302b4cd57042d32fe0b251ee88e032 Mon Sep 17 00:00:00 2001
From: fouratachour <fourat.ach@gmail.com>
Date: Wed, 13 Sep 2017 14:34:36 +0100
Subject: [PATCH 08/11] Working on Upload.sh file

---
 bin/upload.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bin/upload.sh b/bin/upload.sh
index be434b8..4145feb 100755
--- a/bin/upload.sh
+++ b/bin/upload.sh
@@ -21,5 +21,6 @@ echo "Creating archive of test report $ARCHIVE_REPORTER"
 ARCHIVE_REPORTER=TestReport-$PS_VERSION-$FIXED_BRANCH-$(date +%Y-%m-%d_%H_%M_%S)-$TRAVIS_COMMIT.zip
 cd test/itg/$PS_VERSION/ && \
 zip -r $ARCHIVE_REPORTER mochawesome-report/*
+cd ../../..
 ./bin/gdrive-linux-x64 upload --refresh-token $GDRIVE_REFRESH_TOKEN --parent $GDRIVE_DIR "$ARCHIVE_REPORTER"
 echo "Finished uploading test report"

From 047e922392c04c6325d91d4bf2ed97969b583777 Mon Sep 17 00:00:00 2001
From: fouratachour <fourat.ach@gmail.com>
Date: Wed, 13 Sep 2017 14:56:40 +0100
Subject: [PATCH 09/11] Deleting presta version from folder name

---
 bin/upload.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/upload.sh b/bin/upload.sh
index 4145feb..d2ad5e1 100755
--- a/bin/upload.sh
+++ b/bin/upload.sh
@@ -18,7 +18,7 @@ fi
 
 # uploading mochareporter to Gdrive
 echo "Creating archive of test report $ARCHIVE_REPORTER"
-ARCHIVE_REPORTER=TestReport-$PS_VERSION-$FIXED_BRANCH-$(date +%Y-%m-%d_%H_%M_%S)-$TRAVIS_COMMIT.zip
+ARCHIVE_REPORTER=TestReport-$FIXED_BRANCH-$(date +%Y-%m-%d_%H_%M_%S)-$TRAVIS_COMMIT.zip
 cd test/itg/$PS_VERSION/ && \
 zip -r $ARCHIVE_REPORTER mochawesome-report/*
 cd ../../..

From 0313eebdc166197c4c1142f159cf32f86c424197 Mon Sep 17 00:00:00 2001
From: fouratachour <fourat.ach@gmail.com>
Date: Wed, 13 Sep 2017 15:11:27 +0100
Subject: [PATCH 10/11] Changing path to the compressed directory

---
 bin/upload.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/upload.sh b/bin/upload.sh
index d2ad5e1..bf1413a 100755
--- a/bin/upload.sh
+++ b/bin/upload.sh
@@ -22,5 +22,5 @@ ARCHIVE_REPORTER=TestReport-$FIXED_BRANCH-$(date +%Y-%m-%d_%H_%M_%S)-$TRAVIS_COM
 cd test/itg/$PS_VERSION/ && \
 zip -r $ARCHIVE_REPORTER mochawesome-report/*
 cd ../../..
-./bin/gdrive-linux-x64 upload --refresh-token $GDRIVE_REFRESH_TOKEN --parent $GDRIVE_DIR "$ARCHIVE_REPORTER"
+./bin/gdrive-linux-x64 upload --refresh-token $GDRIVE_REFRESH_TOKEN --parent $GDRIVE_DIR "test/itg/$PS_VERSION/$ARCHIVE_REPORTER"
 echo "Finished uploading test report"

From a6149fa7828192851b26b6b1c0225335ef745c36 Mon Sep 17 00:00:00 2001
From: fouratachour <fourat.ach@gmail.com>
Date: Mon, 18 Sep 2017 16:34:39 +0100
Subject: [PATCH 11/11] Code refactoring

---
 bin/upload.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/upload.sh b/bin/upload.sh
index bf1413a..4b9eddc 100755
--- a/bin/upload.sh
+++ b/bin/upload.sh
@@ -17,8 +17,8 @@ else
 fi
 
 # uploading mochareporter to Gdrive
-echo "Creating archive of test report $ARCHIVE_REPORTER"
 ARCHIVE_REPORTER=TestReport-$FIXED_BRANCH-$(date +%Y-%m-%d_%H_%M_%S)-$TRAVIS_COMMIT.zip
+echo "Creating archive of test report $ARCHIVE_REPORTER"
 cd test/itg/$PS_VERSION/ && \
 zip -r $ARCHIVE_REPORTER mochawesome-report/*
 cd ../../..