Test

.gitattributes

@@ -31,4 +31,3 @@
 src/e2e/resources/data/*            linguist-vendored
 src/test/resources/data/*           linguist-vendored
 src/test/resources/emails/*         linguist-vendored
-src/test/resources/pages/*          linguist-vendored

.github/ISSUE_TEMPLATE/bug-report.md

@@ -6,7 +6,7 @@ about: Report a bug or defect in the application
 
 <!-- Issue title: [brief description of bug] -->
 
-- **Environment**: <!-- The environment in which you encountered the bug, e.g. live server at `V6.0.0`, `master` branch at commit 1234567. -->
+- **Environment**: <!-- The environment in which you encountered the bug, e.g. live server at `V7.0.0`, `master` branch at commit 1234567. -->
 
 **Steps to reproduce**
 

.github/ISSUE_TEMPLATE/feature-request.md

@@ -6,7 +6,7 @@ about: Request a new or a change to existing user-facing feature
 
 <!-- Issue title: [brief description of feature/enhancement] -->
 
-- **Environment**: <!-- The environment in which the said feature/enhancement is absent, e.g. live server at `V6.0.0`, `master` branch at commit 1234567. -->
+- **Environment**: <!-- The environment in which the said feature/enhancement is absent, e.g. live server at `V7.0.0`, `master` branch at commit 1234567. -->
 
 **Description of feature/enhancement**
 

.github/SUPPORT.md

@@ -3,8 +3,8 @@
 If you are looking for support for TEAMMATES, check out:
 
 * User Documentation
-  * [For students](http://teammatesv4.appspot.com/studentHelp.jsp)
-  * [For instructors](http://teammatesv4.appspot.com/instructorHelp.jsp)
+  * [For students](https://teammatesv4.appspot.com/web/front/help/student)
+  * [For instructors](https://teammatesv4.appspot.com/web/front/help/instructor)
 * [Developer Documentation](../docs/README.md)
 * [FAQs by external contributors](https://github.com/TEAMMATES/teammates/issues?utf8=✓&q=is:issue+label:a-DevHelp). Note that many of the questions asked and/or answers provided may have been outdated now.
 

.gitignore

@@ -57,5 +57,6 @@ src/main/webapp/*
 src/client/java/teammates/client/scripts/statistics/data/
 src/client/java/teammates/client/scripts/log/
 src/e2e/resources/gmail-api/
+src/e2e/resources/downloads/
 
 !.gitkeep

.travis.yml

@@ -77,7 +77,7 @@ jobs:
         - mv src/e2e/resources/test.travis.properties src/e2e/resources/test.properties
         - ./gradlew createConfigs testClasses generateTypes
         - npm ci
-        - npm run build -- --progress=false
+        - npm run build -- --progress=false --serviceWorker=false
         - ./gradlew appengineStart
       script:
         - ./gradlew e2eTests
@@ -95,7 +95,7 @@ jobs:
         - mv src/e2e/resources/test.travis-chrome.properties src/e2e/resources/test.properties
         - ./gradlew createConfigs testClasses generateTypes
         - npm ci
-        - npm run build -- --progress=false
+        - npm run build -- --progress=false --serviceWorker=false
         - ./gradlew appengineStart
       script:
         - ./gradlew e2eTests

README.md

@@ -1,7 +1,7 @@
 # TEAMMATES Developer Web Site
 
 [![Travis Build Status](https://travis-ci.org/TEAMMATES/teammates.svg?branch=master)](https://travis-ci.org/TEAMMATES/teammates)
-[![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/dvr6t33lqg6hsmxw/branch/master?svg=true)](https://ci.appveyor.com/project/damithc/teammates/branch/master)
+[![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/dvr6t33lqg6hsmxw/branch/master?svg=true)](https://ci.appveyor.com/project/nus-oss/teammates/branch/master)
 [![Codecov Coverage Status](https://codecov.io/gh/TEAMMATES/teammates/branch/master/graph/badge.svg)](https://codecov.io/gh/TEAMMATES/teammates)
 [![License](https://img.shields.io/badge/license-GPLv2-blue.svg)](LICENSE)
 

angular.json

@@ -22,50 +22,12 @@
             "main": "src/web/main.ts",
             "polyfills": "src/web/polyfills.ts",
             "tsConfig": "tsconfig.app.json",
-            "aot": false,
+            "aot": true,
             "assets": [
-              "src/web/assets/",
-              {
-                "glob": "**/*",
-                "input": "node_modules/tinymce/skins",
-                "output": "tinymce/skins"
-              },
-              {
-                "glob": "**/*",
-                "input": "node_modules/tinymce/plugins/emoticons/js",
-                "output": "plugins/emoticons/js"
-              }
+              "src/web/assets/"
             ],
             "styles": [
               "src/web/styles.scss"
-            ],
-            "scripts": [
-              "node_modules/tinymce/tinymce.min.js",
-              "node_modules/tinymce/themes/silver/theme.js",
-              "src/web/tinymce/placeholder-plugin.js",
-              "node_modules/tinymce/plugins/advlist/plugin.js",
-              "node_modules/tinymce/plugins/autolink/plugin.js",
-              "node_modules/tinymce/plugins/lists/plugin.js",
-              "node_modules/tinymce/plugins/link/plugin.js",
-              "node_modules/tinymce/plugins/image/plugin.js",
-              "node_modules/tinymce/plugins/charmap/plugin.js",
-              "node_modules/tinymce/plugins/print/plugin.js",
-              "node_modules/tinymce/plugins/hr/plugin.js",
-              "node_modules/tinymce/plugins/anchor/plugin.js",
-              "node_modules/tinymce/plugins/searchreplace/plugin.js",
-              "node_modules/tinymce/plugins/wordcount/plugin.js",
-              "node_modules/tinymce/plugins/visualblocks/plugin.js",
-              "node_modules/tinymce/plugins/visualchars/plugin.js",
-              "node_modules/tinymce/plugins/code/plugin.js",
-              "node_modules/tinymce/plugins/fullscreen/plugin.js",
-              "node_modules/tinymce/plugins/insertdatetime/plugin.js",
-              "node_modules/tinymce/plugins/nonbreaking/plugin.js",
-              "node_modules/tinymce/plugins/save/plugin.js",
-              "node_modules/tinymce/plugins/table/plugin.js",
-              "node_modules/tinymce/plugins/directionality/plugin.js",
-              "node_modules/tinymce/plugins/emoticons/plugin.js",
-              "node_modules/tinymce/plugins/paste/plugin.js",
-              "node_modules/tinymce/plugins/textpattern/plugin.js"
             ]
           },
           "configurations": {
@@ -78,20 +40,10 @@
               ],
               "index": {
                 "input": "src/web/index.prod.html",
-                "output": "index.html",
+                "output": "index.html"
               },
               "assets": [
                 "src/web/assets/",
-                {
-                  "glob": "**/*",
-                  "input": "node_modules/tinymce/skins",
-                  "output": "tinymce/skins"
-                },
-                {
-                  "glob": "**/*",
-                  "input": "node_modules/tinymce/plugins/emoticons/js",
-                  "output": "plugins/emoticons/js"
-                },
                 "src/web/BingSiteAuth.xml",
                 "src/web/google8c7ef1e995031e09.html",
                 "src/web/pulse.html",

build.gradle

@@ -11,7 +11,7 @@ apply plugin: "com.github.spotbugs"
 apply plugin: "jacoco"
 apply plugin: "cz.habarta.typescript-generator"
 
-def appengineVersion = "1.9.+"
+def appengineVersion = "1.9.81"
 def checkstyleVersion = "8.33"
 def pmdVersion = "6.24.0"
 def spotbugsVersion = "4.0.6"
@@ -151,29 +151,30 @@ tasks.withType(cz.habarta.typescript.generator.gradle.GenerateTask) {
 
 task generateApiOutputFormat(type: cz.habarta.typescript.generator.gradle.GenerateTask) {
     classPatterns = [
-        "teammates.ui.webapi.output.**",
+        "teammates.ui.output.**",
         "teammates.common.datatransfer.questions.**"
     ]
     removeTypeNameSuffix = "Data"
     outputFile = "src/web/types/api-output.ts"
     excludeClassPatterns = [
-        "teammates.ui.webapi.output.**Builder"
+        "teammates.ui.output.**Builder"
     ]
     excludeClasses = [
-        "teammates.ui.webapi.output.SessionResultsData\$NameInfo"
+        "teammates.ui.output.SessionResultsData\$NameInfo"
     ]
 }
 
 task generateApiRequestFormat(type: cz.habarta.typescript.generator.gradle.GenerateTask) {
     classPatterns = [
-        "teammates.ui.webapi.request.**"
+        "teammates.ui.request.**",
+        "teammates.common.util.EmailType"
     ]
     outputFile = "src/web/types/api-request.ts"
 }
 
 task generateApiEndpoints(type: cz.habarta.typescript.generator.gradle.GenerateTask) {
     classPatterns = [
-        "teammates.ui.webapi.endpoints.**"
+        "teammates.ui.endpoints.**"
     ]
     jsonLibrary = 'jackson2'
     jackson2Configuration = [
@@ -372,6 +373,9 @@ def checkTestNgFailureClosure = { descriptor, result ->
     }
 }
 
+def isTravis = System.getenv("TRAVIS") != null
+def isAppVeyor = System.getenv("APPVEYOR") != null
+
 // Displays full exception; to be run after the test fails after the last retry
 def afterTestClosure = { descriptor, result ->
     if (result.resultType == TestResult.ResultType.FAILURE && result.exception != null && result.exception.getMessage() != null) {
@@ -435,24 +439,7 @@ task lint {
 
 // TEST TASKS
 
-def numOfTestRetries = 3
-def isTravis = System.getenv("TRAVIS") != null
-def isAppVeyor = System.getenv("APPVEYOR") != null
-
-test {
-    useTestNG()
-    options.useDefaultListeners = true
-    ignoreFailures false
-    maxHeapSize = "1g"
-    reports.html.enabled = false
-    reports.junitXml.enabled = false
-    jvmArgs "-Xss2m", "-Dfile.encoding=UTF-8"
-    afterTest afterTestClosure
-    afterSuite checkTestNgFailureClosure
-    testLogging {
-        events "passed"
-    }
-}
+def numOfTestRetries = 4
 
 task lnpTests(type: Test) {
     systemProperty "random.testing.seed", new Random().nextInt() // re-run tests even if they are up-to-date
@@ -484,28 +471,28 @@ task lnpTests(type: Test) {
     }
 }
 
-task failedTests(type: Test) {
+task componentTests(type: Test) {
+    description "Runs the full unit and integration test suite."
+    group "Test"
     useTestNG()
-    options.suites "test-output/testng-failed.xml"
-    options.outputDirectory = file("build/reports/test-failed")
+    options.suites "src/test/resources/testng-component.xml"
     options.useDefaultListeners = true
     ignoreFailures false
     maxHeapSize = "1g"
     reports.html.enabled = false
     reports.junitXml.enabled = false
-    jvmArgs "-Xss2m", "-Dfile.encoding=UTF-8"
+    if (isTravis) {
+        jvmArgs "-Xss2m", "-Dfile.encoding=UTF-8", "-Djava.io.tmpdir=" + System.getenv("TRAVIS_BUILD_DIR")
+    } else {
+        jvmArgs "-Xss2m", "-Dfile.encoding=UTF-8"
+    }
     afterTest afterTestClosure
     afterSuite checkTestNgFailureClosure
     testLogging {
         events "passed"
     }
 }
 
-task componentTests {
-    description "Runs the full unit test suite and retries failed test up to ${numOfTestRetries} times."
-    group "Test"
-}
-
 task e2eTests {
     description "Runs the full E2E test suite and retries failed test up to ${numOfTestRetries} times."
     group "Test"
@@ -514,33 +501,6 @@ task e2eTests {
 (1..numOfTestRetries + 1).each { id ->
     def isFirstTry = id == 1
     def isLastRetry = id == numOfTestRetries + 1
-    task "componentTestTry${id}"(type: Test) {
-        useTestNG()
-        options.suites isFirstTry ? "src/test/resources/testng-component.xml" : file("${buildDir}/reports/component-test-try-${id - 1}/testng-failed.xml")
-        options.outputDirectory = file("${buildDir}/reports/component-test-try-${id}")
-        options.useDefaultListeners = true
-        ignoreFailures = !isLastRetry
-        maxHeapSize = "1g"
-        reports.html.enabled = false
-        reports.junitXml.enabled = false
-        if (isTravis) {
-            jvmArgs "-Xss2m", "-Dfile.encoding=UTF-8", "-Djava.io.tmpdir=" + System.getenv("TRAVIS_BUILD_DIR")
-        } else {
-            jvmArgs "-Xss2m", "-Dfile.encoding=UTF-8"
-        }
-        testLogging {
-            events "passed"
-        }
-        if (isLastRetry) {
-            afterTest afterTestClosure
-        } else if (isFirstTry) {
-            afterSuite checkTestNgFailureClosure
-        }
-        onlyIf {
-            isFirstTry || file("${buildDir}/reports/component-test-try-${id - 1}/testng-failed.xml").exists()
-        }
-    }
-    componentTests.dependsOn "componentTestTry${id}"
 
     task "e2eTestTry${id}"(type: Test) {
         useTestNG()
@@ -559,9 +519,8 @@ task e2eTests {
         testLogging {
             events "passed"
         }
-        if (isLastRetry) {
-            afterTest afterTestClosure
-        } else if (isFirstTry) {
+        afterTest afterTestClosure
+        if (isFirstTry) {
             afterSuite checkTestNgFailureClosure
         }
         finalizedBy "killFirefox${id}", "killChromedriver${id}"
@@ -575,8 +534,10 @@ task e2eTests {
         doFirst {
             if (isWindows) {
                 commandLine "taskkill", "/f", "/im", "firefox.exe"
+                commandLine "taskkill", "/f", "/im", "geckodriver.exe"
             } else {
                 commandLine "pkill", "firefox"
+                commandLine "pkill", "geckodriver"
             }
             // Silence output for this task
             standardOutput = new ByteArrayOutputStream()
@@ -608,17 +569,12 @@ jacoco {
     toolVersion = jacocoVersion
 }
 
-task jacocoMerge(type: JacocoMerge) {
-    destinationFile = file("${buildDir}/jacocoMerge/jacocoMerge.exec")
-    executionData fileTree("${buildDir}/jacoco").files
-}
-
 task jacocoReport(type: JacocoReport) {
     description "Runs coverage session from available test run data."
     group "Test"
     sourceDirectories.from files(sourceSets.main.java.srcDirs)
     classDirectories.from files(sourceSets.main.output)
-    executionData jacocoMerge.destinationFile
+    executionData fileTree("${buildDir}/jacoco").files
     reports {
         xml.enabled true
         html.enabled true
@@ -628,7 +584,6 @@ task jacocoReport(type: JacocoReport) {
             fileTree(dir: it, exclude: ["**/*.jar"])
         })
     }
-    dependsOn jacocoMerge
 }
 
 // Helper methods

docs/CONTRIBUTING.md

@@ -2,7 +2,7 @@
 
 Thanks for taking your time to contribute to TEAMMATES!
 
-We welcome contributions from anyone, in particular, students (see [here](https://teammatesv4.appspot.com/about.jsp) for the list of our contributors). One of the main objectives of TEAMMATES is to help students get experience in a OSS production environment. Here are some information that might be useful to would-be contributors.
+We welcome contributions from anyone, in particular, students (see [here](https://teammatesv4.appspot.com/web/front/about) for the list of our contributors). One of the main objectives of TEAMMATES is to help students get experience in an OSS production environment. Here are some information that might be useful to would-be contributors.
 
 * [Getting started](#getting-started)
   * [Know the product/project](#know-the-productproject)
@@ -23,7 +23,7 @@ We welcome contributions from anyone, in particular, students (see [here](https:
 Understand what TEAMMATES is about, both as a product (users' point of view) and a project (developers' point of view).
 
 * [Product intro page](https://teammatesv4.appspot.com) shown to potential users
-* [Features overview](https://teammatesv4.appspot.com/features.jsp)
+* [Features overview](https://teammatesv4.appspot.com/web/front/features)
 * [Project vision, challenges, and principles](overview.md)
 
 ### Code of Conduct
@@ -43,7 +43,7 @@ If you are certain that you are reporting a new issue, [open a new issue](https:
 
 We welcome anyone manually testing our product and reporting bugs or suggestions for enhancements in the issue tracker.
 
-If you want to undertake such a role without actually contributing code, [get an instructor account from TEAMMATES](https://teammatesv4.appspot.com/request.jsp).
+If you want to undertake such a role without actually contributing code, [get an instructor account from TEAMMATES](https://teammatesv4.appspot.com/web/front/request).
 Remember to mention the purpose of your request under "Any other comments/queries". 
 
 ### Submitting a pull request
@@ -86,7 +86,8 @@ Roles:
 
 1. [Set up TEAMMATES development environment on your computer.](setting-up.md)<br>
    **Important: Follow instructions to the letter. Install the specified versions of the tool stack, not the latest versions.**
-1. Get *dev green* (more info in [_Development Guidelines_ document](development.md)).
+1. Get all component tests to pass (more info in [_Development Guidelines_ document](development.md)).
+1. (Optional) Get all E2E tests to pass.
    It is OK to proceed to the next phase if you have fewer than 5 failing test cases.
 
 #### Phase B: Learn
@@ -96,11 +97,10 @@ Try your best to be familiar with at least building and testing the application
 
 #### Phase C: Start contributing
 
-When you are ready for a real contribution, you are advised to start with an issue labelled [d.FirstTimers](https://github.com/TEAMMATES/teammates/issues?q=is:issue+is:open+label:d.FirstTimers) (but do not do more than one of those), then move on to other issues labelled [d.Contributors](https://github.com/TEAMMATES/teammates/issues?q=is:issue+is:open+label:d.Contributors).
+When you are ready for a real contribution, you are advised to start with an issue labelled [good first issue](https://github.com/TEAMMATES/teammates/issues?q=is:issue+is:open+label:"good+first+issue") (but do not do more than one of those), then move on to other issues labelled [help wanted](https://github.com/TEAMMATES/teammates/issues?q=is:issue+is:open+label:"help+wanted").
 Steps for fixing an issue are lined out in the [process document](process.md).
 
-> In the event that you cannot find a `d.FirstTimers`-labelled issue, you can start with a `d.Contributors`-labelled issue.
-> You can consult the `e.*` label, if it is present, to estimate the difficulty. Lower number generally means less amount of work required.
+> In the event that you cannot find a `good first issue`-labelled issue, you can start with a `help wanted`-labelled issue.
 
 #### Important