From 44434c76750e0bc4d0e5dff4c0d9e423d2174403 Mon Sep 17 00:00:00 2001
From: CNZedChou <1021844583@qq.com>
Date: Mon, 7 Jun 2021 23:50:08 +0800
Subject: [PATCH 01/20] Fix clicking the ANSWER button will add the selected
 words repeatedly

---
 app/main.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/main.py b/app/main.py
index 1356f12..8bcd434 100644
--- a/app/main.py
+++ b/app/main.py
@@ -156,6 +156,7 @@ def get_answer_part(s):
 <script type="text/javascript">
 
     function toggle_visibility(id) {
+       window.getSelection().empty()
        var e = document.getElementById(id);
        if(e.style.display == 'block')
           e.style.display = 'none';

From df78a95758087d74365eec9a0d99c86bf4c71f16 Mon Sep 17 00:00:00 2001
From: CNZedChou <1021844583@qq.com>
Date: Tue, 8 Jun 2021 14:56:02 +0800
Subject: [PATCH 02/20] Docker image for flask web applications in py 3.6 and
 above

---
 Dockerfile | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 Dockerfile

diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..3de5ee8
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,3 @@
+FROM tiangolo/uwsgi-nginx-flask:python3.8
+
+COPY ./app /app
\ No newline at end of file

From 685c9fb718f761c3e56b6071dfdd5620a7d48524 Mon Sep 17 00:00:00 2001
From: CNZedChou <1021844583@qq.com>
Date: Thu, 10 Jun 2021 14:39:17 +0800
Subject: [PATCH 03/20] Jenkinsfile update with test and deploy stage under
 construction

---
 Jenkinsfile | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 Jenkinsfile

diff --git a/Jenkinsfile b/Jenkinsfile
new file mode 100644
index 0000000..48991a8
--- /dev/null
+++ b/Jenkinsfile
@@ -0,0 +1,37 @@
+pipeline {
+	agent any
+	parameters {
+	    gitParameter branchFilter: 'origin/(.*)', defaultValue: 'SPM-Spring2021-2597-蓝嘉婕201831990605', name: 'BRANCH', type: 'PT_BRANCH'
+	}
+	stages {
+	    stage('Ckeckout') {
+	        steps {
+	            git branch: "${params.BRANCH}", url: 'https://github.com/lanlab-org/EnglishPal.git'
+	        }
+	    }
+        stage('MakeDatabasefile') {
+	        steps {
+	            sh 'touch ./app/static/wordfreqapp.db && rm -f ./app/static/wordfreqapp.db'
+	            sh 'cat ./app/static/wordfreqapp.sql | sqlite3 ./app/static/wordfreqapp.db'
+	        }
+	    }
+        stage('BuildIt') {
+            steps {
+                echo 'Building..'
+		        sh 'sudo docker build -t englishpalljj .'
+		        sh 'sudo docker stop $(docker ps -aq)'
+		        sh 'sudo docker run -d -p 5000:80 -v /var/lib/jenkins/workspace/EnglishPal_Pipeline_master/app/static/frequency:/app/static/frequency -t englishpalljj'
+		    }
+        }
+        stage('TestIt') {
+            steps {
+                echo 'Under Construction....'
+            }
+        }
+        stage('DeployIt') {
+            steps {
+                echo 'Under Construction....'
+            }
+        }
+    }
+}

From 589a331c68f2956111d3184a305da2df069c1f6c Mon Sep 17 00:00:00 2001
From: CNZedChou <1021844583@qq.com>
Date: Thu, 10 Jun 2021 14:58:49 +0800
Subject: [PATCH 04/20] Add a test script version 1.0 for our bug fix
 assignment

---
 app/test/test_fix_click_answer_bug.py | 64 +++++++++++++++++++++++++++
 1 file changed, 64 insertions(+)
 create mode 100644 app/test/test_fix_click_answer_bug.py

diff --git a/app/test/test_fix_click_answer_bug.py b/app/test/test_fix_click_answer_bug.py
new file mode 100644
index 0000000..3b31e64
--- /dev/null
+++ b/app/test/test_fix_click_answer_bug.py
@@ -0,0 +1,64 @@
+# -*- coding: utf-8 -*-
+# Run the docker image using the following command:
+# docker run -d -p 4444:4444 selenium/standalone-chrome
+from selenium import webdriver
+from selenium.webdriver.common.desired_capabilities import DesiredCapabilities
+
+import random, time
+import string
+
+driver = webdriver.Remote('http://localhost:4444/wd/hub', DesiredCapabilities.CHROME)
+driver.implicitly_wait(10)
+
+HOME_PAGE = 'http://121.4.94.30:91/'
+
+
+def has_punctuation(s):
+    return [c for c in s if c in string.punctuation] != []
+
+
+def test_add_word():
+    try:
+        driver.get(HOME_PAGE)
+        assert 'English Pal -' in driver.page_source
+
+        # login
+        elem = driver.find_element_by_link_text('登录')
+        elem.click()
+
+        uname = 'lanhui'
+        password = 'l0ve1t'
+        elem = driver.find_element_by_name('username')
+        elem.send_keys(uname)
+
+        elem = driver.find_element_by_name('password')
+        elem.send_keys(password)
+
+        elem = driver.find_element_by_xpath('//form[1]/p[3]/input[1]')  # 找到登录按钮
+        elem.click()
+
+        assert 'EnglishPal Study Room for ' + uname in driver.title
+
+        # get essay content
+        elem = driver.find_element_by_id('text-content')
+        essay_content = elem.text
+
+        elem = driver.find_element_by_id('selected-words')
+        word = random.choice(essay_content.split())
+        while 'font>' in word or 'br>' in word or 'p>' in word or len(word) < 5 or has_punctuation(word):
+            word = random.choice(essay_content.split())
+
+        elem.send_keys(word)
+        #find answer button, and click it twice
+        answer = driver.find_element_by_xpath('/html/body/div/button')
+        answer.click()
+        answer.click()
+
+        elem = driver.find_element_by_xpath('//form[1]//input[1]')  # 找到get所有词频按钮
+        elem.click()
+
+        preq = driver.find_element_by_xpath('/html/body/form/p[1]/text()[2]')
+
+        assert preq == ' (1) '
+    finally:
+        driver.quit()

From 44284bb9a094d8602651c9e5498e4a2ef9941bc3 Mon Sep 17 00:00:00 2001
From: CNZedChou <1021844583@qq.com>
Date: Thu, 10 Jun 2021 15:00:56 +0800
Subject: [PATCH 05/20] Update jenkinsfile for test stage

---
 Jenkinsfile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 48991a8..cc28766 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -25,7 +25,10 @@ pipeline {
         }
         stage('TestIt') {
             steps {
-                echo 'Under Construction....'
+                sh 'sudo docker run -d -p 4444:4444 selenium/standalone-chrome'
+		        sh 'pip3 install pytest -U -q'
+		        sh 'pip3 install selenium -U -q'
+		        sh 'pytest -v -s --html=EnglishPalTestReport.html ./app/test'
             }
         }
         stage('DeployIt') {

From 4c1da1c30eee8b67e60022858746d6b9bcd34b00 Mon Sep 17 00:00:00 2001
From: CNZedChou <1021844583@qq.com>
Date: Thu, 10 Jun 2021 15:09:34 +0800
Subject: [PATCH 06/20] Port update in jenkinsfile

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index cc28766..6799c4a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -20,7 +20,7 @@ pipeline {
                 echo 'Building..'
 		        sh 'sudo docker build -t englishpalljj .'
 		        sh 'sudo docker stop $(docker ps -aq)'
-		        sh 'sudo docker run -d -p 5000:80 -v /var/lib/jenkins/workspace/EnglishPal_Pipeline_master/app/static/frequency:/app/static/frequency -t englishpalljj'
+		        sh 'sudo docker run -d -p 91:80 -v /var/lib/jenkins/workspace/EnglishPal_Pipeline_master/app/static/frequency:/app/static/frequency -t englishpalljj'
 		    }
         }
         stage('TestIt') {

From 209505155ffd29d851e605fc5f5f3f21329a08d4 Mon Sep 17 00:00:00 2001
From: CNZedChou <1021844583@qq.com>
Date: Thu, 10 Jun 2021 15:11:29 +0800
Subject: [PATCH 07/20] Update gitignore file

---
 .gitignore | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/.gitignore b/.gitignore
index 7a8be9f..9dcb26c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,17 @@ app/static/wordfreqapp.db
 app/static/wordfreqapp.sql
 app/static/donate-the-author.jpg
 app/static/donate-the-author-hidden.jpg
+.idea/.gitignore
+.idea/EnglishPal.iml
+.idea/inspectionProfiles/
+.idea/misc.xml
+.idea/modules.xml
+.idea/vcs.xml
+app/.idea/.gitignore
+app/.idea/app.iml
+app/.idea/inspectionProfiles/
+app/.idea/misc.xml
+app/.idea/modules.xml
+app/.idea/vcs.xml
+app/test/.cache/
+/app/static/wordfreqapp.sql

From 4f80124fd59d25e5658df4d1b7e0e37db4af0367 Mon Sep 17 00:00:00 2001
From: CNZedChou <1021844583@qq.com>
Date: Thu, 10 Jun 2021 15:15:58 +0800
Subject: [PATCH 08/20] Update gitignore file

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 9dcb26c..06fee38 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,4 +23,4 @@ app/.idea/misc.xml
 app/.idea/modules.xml
 app/.idea/vcs.xml
 app/test/.cache/
-/app/static/wordfreqapp.sql
+

From f9b32c08cb8a692e3ceced9558f2f90ee82ff9da Mon Sep 17 00:00:00 2001
From: CNZedChou <1021844583@qq.com>
Date: Thu, 10 Jun 2021 15:29:40 +0800
Subject: [PATCH 09/20] update test script method name

---
 app/test/test_fix_click_answer_bug.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/test/test_fix_click_answer_bug.py b/app/test/test_fix_click_answer_bug.py
index 3b31e64..9613093 100644
--- a/app/test/test_fix_click_answer_bug.py
+++ b/app/test/test_fix_click_answer_bug.py
@@ -17,7 +17,7 @@ def has_punctuation(s):
     return [c for c in s if c in string.punctuation] != []
 
 
-def test_add_word():
+def test_fix_click_answer_bug():
     try:
         driver.get(HOME_PAGE)
         assert 'English Pal -' in driver.page_source

From 2d861c38b91a66ab4bbd5d89ae62fb36887b9a1e Mon Sep 17 00:00:00 2001
From: CNZedChou <1021844583@qq.com>
Date: Thu, 10 Jun 2021 16:03:23 +0800
Subject: [PATCH 10/20] The result of the xpath expression should be an element

---
 app/test/test_fix_click_answer_bug.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/test/test_fix_click_answer_bug.py b/app/test/test_fix_click_answer_bug.py
index 9613093..32fe8b2 100644
--- a/app/test/test_fix_click_answer_bug.py
+++ b/app/test/test_fix_click_answer_bug.py
@@ -57,8 +57,8 @@ def test_fix_click_answer_bug():
         elem = driver.find_element_by_xpath('//form[1]//input[1]')  # 找到get所有词频按钮
         elem.click()
 
-        preq = driver.find_element_by_xpath('/html/body/form/p[1]/text()[2]')
+        preq = driver.find_element_by_xpath('/html/body/form/p[1]')
 
-        assert preq == ' (1) '
+        assert preq.text()[2] == ' (1) '
     finally:
         driver.quit()

From d89e1a1dfc0604db0dc14325857850b19e2d5fbf Mon Sep 17 00:00:00 2001
From: CNZedChou <1021844583@qq.com>
Date: Thu, 10 Jun 2021 16:24:17 +0800
Subject: [PATCH 11/20] fix bug

---
 app/test/test_fix_click_answer_bug.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/test/test_fix_click_answer_bug.py b/app/test/test_fix_click_answer_bug.py
index 32fe8b2..de85f23 100644
--- a/app/test/test_fix_click_answer_bug.py
+++ b/app/test/test_fix_click_answer_bug.py
@@ -57,8 +57,7 @@ def test_fix_click_answer_bug():
         elem = driver.find_element_by_xpath('//form[1]//input[1]')  # 找到get所有词频按钮
         elem.click()
 
-        preq = driver.find_element_by_xpath('/html/body/form/p[1]')
-
-        assert preq.text()[2] == ' (1) '
+        preq = driver.find_element_by_xpath('/html/body/form/p[1]/text()').extract()[2]
+        assert preq == ' (1) '
     finally:
         driver.quit()

From e14b372983316a2de396508045919a8ccd6cdeeb Mon Sep 17 00:00:00 2001
From: CNZedChou <1021844583@qq.com>
Date: Thu, 10 Jun 2021 17:42:56 +0800
Subject: [PATCH 12/20] test script version 1.1

---
 app/test/test_fix_click_answer_bug.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/test/test_fix_click_answer_bug.py b/app/test/test_fix_click_answer_bug.py
index de85f23..2607830 100644
--- a/app/test/test_fix_click_answer_bug.py
+++ b/app/test/test_fix_click_answer_bug.py
@@ -57,7 +57,7 @@ def test_fix_click_answer_bug():
         elem = driver.find_element_by_xpath('//form[1]//input[1]')  # 找到get所有词频按钮
         elem.click()
 
-        preq = driver.find_element_by_xpath('/html/body/form/p[1]/text()').extract()[2]
-        assert preq == ' (1) '
+        preq = driver.find_element_by_xpath('/html/body/form/p[1]')
+        assert preq.text.split()[2] == '(1)'
     finally:
         driver.quit()

From d20f6ef893ed182c9b651701c6c3bf0d0cb819c3 Mon Sep 17 00:00:00 2001
From: CNZedChou <1021844583@qq.com>
Date: Thu, 10 Jun 2021 22:57:56 +0800
Subject: [PATCH 13/20] test script version 2.0, use ActionChains to perform
 mouse actions, otherwise javascript will not be triggered

---
 app/test/test_fix_click_answer_bug.py | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/app/test/test_fix_click_answer_bug.py b/app/test/test_fix_click_answer_bug.py
index 2607830..a087064 100644
--- a/app/test/test_fix_click_answer_bug.py
+++ b/app/test/test_fix_click_answer_bug.py
@@ -3,7 +3,7 @@
 # docker run -d -p 4444:4444 selenium/standalone-chrome
 from selenium import webdriver
 from selenium.webdriver.common.desired_capabilities import DesiredCapabilities
-
+from selenium.webdriver import ActionChains
 import random, time
 import string
 
@@ -40,15 +40,8 @@ def test_fix_click_answer_bug():
         assert 'EnglishPal Study Room for ' + uname in driver.title
 
         # get essay content
-        elem = driver.find_element_by_id('text-content')
-        essay_content = elem.text
-
-        elem = driver.find_element_by_id('selected-words')
-        word = random.choice(essay_content.split())
-        while 'font>' in word or 'br>' in word or 'p>' in word or len(word) < 5 or has_punctuation(word):
-            word = random.choice(essay_content.split())
-
-        elem.send_keys(word)
+        elem = driver.find_element_by_xpath("/html/body/div/p[3]/font")
+        ActionChains(driver).double_click(elem).perform()
         #find answer button, and click it twice
         answer = driver.find_element_by_xpath('/html/body/div/button')
         answer.click()

From 83d3122b303faade375c4166e5faf6dc283a8986 Mon Sep 17 00:00:00 2001
From: CNZedChou <1021844583@qq.com>
Date: Thu, 10 Jun 2021 23:19:21 +0800
Subject: [PATCH 14/20] modify jenkinsfile which should be merged from master

---
 Jenkinsfile | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 6799c4a..42f2f54 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -4,11 +4,6 @@ pipeline {
 	    gitParameter branchFilter: 'origin/(.*)', defaultValue: 'SPM-Spring2021-2597-蓝嘉婕201831990605', name: 'BRANCH', type: 'PT_BRANCH'
 	}
 	stages {
-	    stage('Ckeckout') {
-	        steps {
-	            git branch: "${params.BRANCH}", url: 'https://github.com/lanlab-org/EnglishPal.git'
-	        }
-	    }
         stage('MakeDatabasefile') {
 	        steps {
 	            sh 'touch ./app/static/wordfreqapp.db && rm -f ./app/static/wordfreqapp.db'
@@ -18,17 +13,18 @@ pipeline {
         stage('BuildIt') {
             steps {
                 echo 'Building..'
-		        sh 'sudo docker build -t englishpalljj .'
-		        sh 'sudo docker stop $(docker ps -aq)'
-		        sh 'sudo docker run -d -p 91:80 -v /var/lib/jenkins/workspace/EnglishPal_Pipeline_master/app/static/frequency:/app/static/frequency -t englishpalljj'
-		    }
+                sh 'sudo docker build -t englishpal .'
+                sh 'sudo docker stop $(docker ps -aq)'
+                sh 'sudo docker run -d -p 91:80 -v /var/lib/jenkins/workspace/EnglishPal_Pipeline_master/app/static/frequency:/app/static/frequency -t englishpal'
+            }
         }
         stage('TestIt') {
             steps {
+                echo 'Testing..'
                 sh 'sudo docker run -d -p 4444:4444 selenium/standalone-chrome'
-		        sh 'pip3 install pytest -U -q'
-		        sh 'pip3 install selenium -U -q'
-		        sh 'pytest -v -s --html=EnglishPalTestReport.html ./app/test'
+                sh 'pip3 install pytest -U -q'
+                sh 'pip3 install selenium -U -q'
+                sh 'pytest -v -s –html=EnglishPalTestReport.html ./app/test'
             }
         }
         stage('DeployIt') {

From fd093643cc3df939fb9ea40c45c438719c76eb93 Mon Sep 17 00:00:00 2001
From: CNZedChou <1021844583@qq.com>
Date: Fri, 11 Jun 2021 00:28:06 +0800
Subject: [PATCH 15/20] update the way how test script get essay content, more
 reasonable now

---
 app/test/test_add_word.py                           | 3 +--
 app/test/test_add_word_and_essay_does_not_change.py | 5 ++---
 app/test/test_next_essay.py                         | 3 +--
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/app/test/test_add_word.py b/app/test/test_add_word.py
index 9a46fe3..3490ad6 100644
--- a/app/test/test_add_word.py
+++ b/app/test/test_add_word.py
@@ -39,8 +39,7 @@ def test_add_word():
         assert 'EnglishPal Study Room for ' + uname in  driver.title
     
         # get essay content
-        elem = driver.find_element_by_id('text-content')
-        essay_content = elem.text
+        essay_content = driver.find_elements_by_xpath('/html/body/div/p[3]/font')[0].text
     
         elem = driver.find_element_by_id('selected-words')
         word = random.choice(essay_content.split())
diff --git a/app/test/test_add_word_and_essay_does_not_change.py b/app/test/test_add_word_and_essay_does_not_change.py
index 61af4b8..288044d 100644
--- a/app/test/test_add_word_and_essay_does_not_change.py
+++ b/app/test/test_add_word_and_essay_does_not_change.py
@@ -40,9 +40,8 @@ def test_add_word_and_essay_does_not_change():
     
         # get essay content
         driver.save_screenshot('./app/test/test_add_word_and_essay_does_not_change_pic0.png')    
-        elem = driver.find_element_by_id('text-content')
-        essay_content = elem.text
-    
+        essay_content = driver.find_elements_by_xpath('/html/body/div/p[3]/font')[0].text
+
         elem = driver.find_element_by_id('selected-words')
         word = random.choice(essay_content.split())
         while 'font>' in word or 'br>' in word or 'p>' in word or len(word) < 5 or has_punctuation(word):
diff --git a/app/test/test_next_essay.py b/app/test/test_next_essay.py
index 98d748c..7cb3b4f 100644
--- a/app/test/test_next_essay.py
+++ b/app/test/test_next_essay.py
@@ -37,8 +37,7 @@ def test_next():
     
         # get essay content
         driver.save_screenshot('./app/test/test_next_essay_pic0.png')    
-        elem = driver.find_element_by_id('text-content')
-        essay_content = elem.text
+        essay_content = driver.find_elements_by_xpath('/html/body/div/p[3]/font')[0].text
     
         # click Next
         diff = 0

From 746907427a124dfae4f4a8ac8254a1b28097e9db Mon Sep 17 00:00:00 2001
From: Zed Chou <44132433+CNZedChou@users.noreply.github.com>
Date: Fri, 11 Jun 2021 07:25:37 +0800
Subject: [PATCH 16/20] fix bug of index error

---
 app/test/test_add_word_and_essay_does_not_change.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/test/test_add_word_and_essay_does_not_change.py b/app/test/test_add_word_and_essay_does_not_change.py
index 288044d..ada945a 100644
--- a/app/test/test_add_word_and_essay_does_not_change.py
+++ b/app/test/test_add_word_and_essay_does_not_change.py
@@ -40,12 +40,14 @@ def test_add_word_and_essay_does_not_change():
     
         # get essay content
         driver.save_screenshot('./app/test/test_add_word_and_essay_does_not_change_pic0.png')    
-        essay_content = driver.find_elements_by_xpath('/html/body/div/p[3]/font')[0].text
-
+        article_content = driver.find_elements_by_xpath('/html/body/div/p[3]/font')[0].text
+        elem = driver.find_element_by_id('text-content')
+        essay_content = elem.text
+        
         elem = driver.find_element_by_id('selected-words')
-        word = random.choice(essay_content.split())
+        word = random.choice(article_content.split())
         while 'font>' in word or 'br>' in word or 'p>' in word or len(word) < 5 or has_punctuation(word):
-            word = random.choice(essay_content.split())        
+            word = random.choice(article_content.split())        
         elem.send_keys(word)
         elem = driver.find_element_by_xpath('//form[1]//input[1]') # 找到get所有词频按钮
         elem.click()

From edff5a75ac7f8b6dfce782a0ffca7b407ef12548 Mon Sep 17 00:00:00 2001
From: Zed Chou <44132433+CNZedChou@users.noreply.github.com>
Date: Fri, 11 Jun 2021 07:36:50 +0800
Subject: [PATCH 17/20] Update Jenkinsfile

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 42f2f54..afb30e7 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -24,7 +24,7 @@ pipeline {
                 sh 'sudo docker run -d -p 4444:4444 selenium/standalone-chrome'
                 sh 'pip3 install pytest -U -q'
                 sh 'pip3 install selenium -U -q'
-                sh 'pytest -v -s –html=EnglishPalTestReport.html ./app/test'
+                sh 'pytest -v -s –-html=EnglishPalTestReport.html ./app/test'
             }
         }
         stage('DeployIt') {

From 63b30ebb9ffa7b65ac68d4ab4fa0aa4560e0ed7f Mon Sep 17 00:00:00 2001
From: Zed Chou <44132433+CNZedChou@users.noreply.github.com>
Date: Fri, 11 Jun 2021 13:22:06 +0800
Subject: [PATCH 18/20] Update Jenkinsfile

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index afb30e7..d234a7c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -24,7 +24,7 @@ pipeline {
                 sh 'sudo docker run -d -p 4444:4444 selenium/standalone-chrome'
                 sh 'pip3 install pytest -U -q'
                 sh 'pip3 install selenium -U -q'
-                sh 'pytest -v -s –-html=EnglishPalTestReport.html ./app/test'
+                sh 'pytest -v -s html=EnglishPalTestReport.html ./app/test'
             }
         }
         stage('DeployIt') {

From ef4a7246603cef29b6ef35be363fd71d9ea4011a Mon Sep 17 00:00:00 2001
From: Zed Chou <44132433+CNZedChou@users.noreply.github.com>
Date: Fri, 11 Jun 2021 13:44:27 +0800
Subject: [PATCH 19/20] Update Jenkinsfile

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index d234a7c..cabba9a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -24,7 +24,7 @@ pipeline {
                 sh 'sudo docker run -d -p 4444:4444 selenium/standalone-chrome'
                 sh 'pip3 install pytest -U -q'
                 sh 'pip3 install selenium -U -q'
-                sh 'pytest -v -s html=EnglishPalTestReport.html ./app/test'
+                sh 'pytest -v -s --html=EnglishPalTestReport.html ./app/test'
             }
         }
         stage('DeployIt') {

From 8691fbdd59985563c1ffa22954a0bd1111b98550 Mon Sep 17 00:00:00 2001
From: CNZedChou <1021844583@qq.com>
Date: Fri, 11 Jun 2021 23:10:11 +0800
Subject: [PATCH 20/20] this file contains the link to our demonstration video

---
 video_link.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 video_link.txt

diff --git a/video_link.txt b/video_link.txt
new file mode 100644
index 0000000..2ef5676
--- /dev/null
+++ b/video_link.txt
@@ -0,0 +1 @@
+link to our Demonstration video : https://www.bilibili.com/video/BV1G5411u7Gc
\ No newline at end of file