Spm spring2021 2597 蓝嘉婕201831990605

.gitignore

@@ -9,3 +9,17 @@ app/static/frequency/frequency.p
 app/static/wordfreqapp.db
 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/
+

Dockerfile

@@ -1,2 +1,3 @@
-FROM tiangolo/uwsgi-nginx-flask:python3.6
+FROM tiangolo/uwsgi-nginx-flask:python3.8
+
 COPY ./app /app

Jenkinsfile

@@ -1,33 +1,35 @@
 pipeline {
-    agent any
-
-    stages {
+	agent any
+	parameters {
+	    gitParameter branchFilter: 'origin/(.*)', defaultValue: 'SPM-Spring2021-2597-蓝嘉婕201831990605', name: 'BRANCH', type: 'PT_BRANCH'
+	}
+	stages {
         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'
+	        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 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'
+                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 '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') {
             steps {
-                echo 'Deploying (TBD)'
+                echo 'Under Construction....'
             }
         }
     }

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';

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())

app/test/test_add_word_and_essay_does_not_change.py

@@ -40,13 +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')    
+        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()

app/test/test_fix_click_answer_bug.py

@@ -0,0 +1,56 @@
+# -*- 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
+from selenium.webdriver import ActionChains
+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_fix_click_answer_bug():
+    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_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()
+        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]')
+        assert preq.text.split()[2] == '(1)'
+    finally:
+        driver.quit()

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

video_link.txt

@@ -0,0 +1 @@
+link to our Demonstration video : https://www.bilibili.com/video/BV1G5411u7Gc