Closes #12. Closes #8

jespitiaa · jespitiaa · commit 6192d8a399d0 · 2020-03-31T18:23:02.000-05:00
diff --git a/cypress/integration/monkey/monkey.js b/cypress/integration/monkey/monkey.js
@@ -6,7 +6,7 @@ const url = Cypress.config('baseUrl') || "https://uniandes.edu.co/"
 const appName = Cypress.env('appName')|| "your app"
 const events = Cypress.env('events')|| 100
 const delay = Cypress.env('delay') || 100
-const seed = Cypress.env('seed') || 12 
+var seed = Cypress.env('seed')
 
 const pct_clicks = Cypress.env('pctClicks') || 19
 const pct_scrolls = Cypress.env('pctScroll') || 17
@@ -511,10 +511,11 @@ var pending_events = [,,,,,]
 
 describe( `${appName} under monkeys`, function() {
     it(`visits ${appName} and survives monkeys`, function() {
-        beforeEach(()=>{
-            cy.task('logStart')
-        })
+        if(!seed) seed = getRandomInt(0, Number.MAX_SAFE_INTEGER);
 
+        cy.task('logStart', {"type":"monkey", "url":url, "seed":seed})
+        cy.log(`Seed: ${seed}`)
+        cy.task('genericLog', {"message":`Seed: ${seed}`})
         let pcg = pct_clicks+pct_scrolls+pct_keys+pct_pgnav+pct_selectors+pct_spkeys
         if(pcg === 100){
 
diff --git a/cypress/integration/monkey/smart-monkey.js b/cypress/integration/monkey/smart-monkey.js
@@ -7,7 +7,7 @@ const url = Cypress.config('baseUrl') || "https://uniandes.edu.co/";
 const appName = Cypress.env('appName')|| "your app";
 const events = Cypress.env('events')|| 100;
 const delay = Cypress.env('delay') || 100;
-const seed = Cypress.env('seed') || 12;
+var seed = Cypress.env('seed');
 
 const num_categories = 7;
 
@@ -639,9 +639,11 @@ const functions = [
 
 describe( `${appName} under smarter monkeys`, function() {
     it(`visits ${appName} and survives smarter monkeys`, function() {
-        beforeEach(()=>{
-            cy.task('logStart')
-        })
+        if(!seed) seed = getRandomInt(0, Number.MAX_SAFE_INTEGER);
+        
+        cy.task('logStart', {"type":"monkey", "url":url, "seed":seed})
+        cy.log(`Seed: ${seed}`)
+        cy.task('genericLog', {"message":`Seed: ${seed}`})
 
         let pcg = pct_clicks+pct_scrolls+pct_keys+pct_pgnav+pct_selectors+pct_spkeys+pct_actions+pct_browserChaos;
         if(pcg === 100){
diff --git a/cypress/plugins/index.js b/cypress/plugins/index.js
@@ -33,8 +33,12 @@ module.exports = (on, config) => {
       })
       return null
     },
-    logStart(){
-      fs.appendFile(LOG_FILENAME, "<html><body><ol type = '1'>", (err) => {
+    logStart({type, url, seed}){
+      //Date might be inaccurate
+      var currentdate = new Date(Date.now());
+      var date = currentdate.getDay() + "/" + currentdate.getMonth() + "/" + currentdate.getFullYear();
+      var time = currentdate.getHours() + ":" + currentdate.getMinutes() + ":" + currentdate.getSeconds();
+      fs.appendFile(LOG_FILENAME, `<html><body><h1>Execution of ${type} in <a href = ${url}>${url}</a></h1><h2>Date of execution: ${date} at ${time}</h2><h2>Seed:${seed}</h2><ol type = '1'>`, (err) => {
         if (err) throw err
         console.log(`Log started`)
       })
@@ -52,6 +56,9 @@ module.exports = (on, config) => {
         if (err) throw err
         console.log(`Logged error`)
       })
+    },
+    genericLog({message}){
+      console.log(message)
     }
   })
 
diff --git a/monkey-config.json b/monkey-config.json
@@ -2,7 +2,7 @@
 
 {
     "projectId":"TSDL-Monkey-with-cypress",
-    "baseUrl":"https://uniandes.edu.co/",
+    "baseUrl":"https://caev03.github.io",
     "env":{
         "appName":"App prueba",
         "events":50,

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`{`
`4`	`4`	`"projectId":"TSDL-Monkey-with-cypress",`
`5`		`- "baseUrl":"https://uniandes.edu.co/",`
	`5`	`+ "baseUrl":"https://caev03.github.io",`
`6`	`6`	`"env":{`
`7`	`7`	`"appName":"App prueba",`
`8`	`8`	`"events":50,`