Merge pull request #1111 from UniversityOfHelsinkiCS/trunk

merge pull request, fac, cypress is the worst
UniversityOfHelsinkiCS · Jul 11, 2019 · ddf1fed · ddf1fed
2 parents c8f038f + 1a1de69
commit ddf1fed
Show file tree

Hide file tree

Showing 14 changed files with 208 additions and 101 deletions.
diff --git a/cypress/integration/Student_statistics.js b/cypress/integration/Student_statistics.js
@@ -11,7 +11,6 @@ describe('Student Statistics tests', () => {
                 }
             }
         })
-        console.log(Cypress.config().baseUrl)
         cy.visit(Cypress.config().baseUrl)
         cy.contains("Student statistics").click()
         cy.contains("Student names hidden")
@@ -71,4 +70,16 @@ describe('Student Statistics tests', () => {
         cy.get('.prompt').clear().type('01114')
         cy.contains('Student number').should('not.exist')
     })
+
+    // why the fuck this test doesn't work TELL ME
+
+    // it('Can jump to population page', () => {
+    //     cy.get('.prompt').type('Oinonen')
+    //     cy.contains('011143561').click()
+    //     cy.get('i.level.up.alternate.icon').eq(0).click()
+    //     cy.wait(5000)
+    //     cy.contains('Population statistics')
+    //     cy.wait(5000)
+    //     cy.contains('Credit accumulation (for 1 students)')
+    // })
 })
diff --git a/services/backend/oodikone2-backend/package-lock.json b/services/backend/oodikone2-backend/package-lock.json
diff --git a/services/backend/oodikone2-backend/package.json b/services/backend/oodikone2-backend/package.json
@@ -46,7 +46,7 @@
     "express": "^4.16.4",
     "jsonwebtoken": "^8.4.0",
     "kafka-node": "^4.1.1",
-    "lodash": "^4.17.10",
+    "lodash": "^4.17.13",
     "mkdirp": "^0.5.1",
     "moment": "^2.22.2",
     "morgan": "^1.9.1",

diff --git a/services/backend/updater_writer/package-lock.json b/services/backend/updater_writer/package-lock.json