Merge pull request #21 from remotemobprogramming/smoketests

Smoketests

Author: hollesse

.github/workflows/smoketest.yml

@@ -1,28 +1,26 @@
 on:
   schedule:
     - cron: '*/5 * * * *'
-  push:
-name: Smoketest
+name: Smoketest on PROD
 jobs:
   smoketest:
     runs-on: ubuntu-latest
-    name: Smoketest
+    name: Smoketest on PROD
     steps:
       - name: Checkout
         uses: actions/checkout@v2
-
       - name: Cypress run
         uses: cypress-io/github-action@v4
         with:
           working-directory: cypress
-          #spec: cypress/cypress/e2e/smoketest.cy.js
-      - uses: actions/upload-artifact@v2
+      - name: Upload screenshots
+        uses: actions/upload-artifact@v2
         if: failure()
         with:
           name: cypress-screenshots
           path: cypress/cypress/screenshots
-      # Test run video was always captured, so this action uses "always()" condition
-      - uses: actions/upload-artifact@v2
+      - name: Upload videos
+        uses: actions/upload-artifact@v2
         if: failure()
         with:
           name: cypress-videos

cypress/cypress/e2e/smoketest.cy.js

@@ -42,30 +42,4 @@ describe('Mob.sh Timer', () => {
     cy.get('#timer').should('not.contain', '00:00')
     cy.get('#timer-type').contains('☕')
   })
-
-  it('history increases for timer button', () => {
-    cy.visit('https://timer.mob.sh/' + roomId)
-    cy.get('[data-bs-toggle="modal"]').click()
-    cy.get('#timer-input').clear().type("1")
-    cy.wait(100)
-    cy.get('.btn-close').click()
-    let initialHistoryCountChainer = cy.get('#history-container').find('li').its('length')
-    cy.get('#timer-button').contains(1).click().wait(200)
-    cy.get('#history-container').find('li').its('length').then(currentCount => {
-      initialHistoryCountChainer.should('eq', currentCount - 1)
-    })
-  })
-
-  it('history increases for breaktimer button', () => {
-    cy.visit('https://timer.mob.sh/' + roomId)
-    cy.get('[data-bs-toggle="modal"]').click()
-    cy.get('#breaktimer-input').clear().type("1")
-    cy.wait(100)
-    cy.get('.btn-close').click()
-    let initialHistoryCountChainer = cy.get('#history-container').find('li').its('length')
-    cy.get('#breaktimer-button').contains(1).click().wait(200)
-    cy.get('#history-container').find('li').its('length').then(currentCount => {
-      initialHistoryCountChainer.should('eq', currentCount - 1)
-    })
-  })
 })

src/main/java/sh/mob/timer/web/RoomApiController.java

@@ -24,7 +24,7 @@
 @RequestMapping()
 public class RoomApiController {
 
-  private static final String SMOKETEST_ROOM_NAME_PREFIX = "testroom-";
+  private static final String SMOKETEST_ROOM_NAME = "testroom-310a9c47-515c-4ad7-a229-ae8efbab7387";
   private static final Logger log = LoggerFactory.getLogger(RoomApiController.class);
   private final RoomRepository roomRepository;
   private final Clock clock;
@@ -83,9 +83,7 @@ public void publishEvent(@PathVariable String roomId, @RequestBody PutTimerReque
           timerRequest.timer,
           timerRequest.user,
           room.name());
-      if (!room.name().startsWith(SMOKETEST_ROOM_NAME_PREFIX)) {
-        stats.incrementTimer(timer);
-      }
+      incrementTimerStatsExceptForTestRoom(room, timer);
     } else if (timerRequest.breaktimer() != null) {
       long breaktimer = truncateTooLongTimers(timerRequest.breaktimer());
       room.addBreaktimer(breaktimer, timerRequest.user());
@@ -94,14 +92,24 @@ public void publishEvent(@PathVariable String roomId, @RequestBody PutTimerReque
           timerRequest.breaktimer(),
           timerRequest.user,
           room.name());
-      if (!room.name().startsWith(SMOKETEST_ROOM_NAME_PREFIX)) {
-        stats.incrementBreaktimer(breaktimer);
-      }
+      incrementBreakTimerStatsExceptForTestRoom(room, breaktimer);
     } else {
       log.warn("Could not understand PUT request for room {}", roomId);
     }
   }
 
+  private void incrementBreakTimerStatsExceptForTestRoom(Room room, long breaktimer) {
+    if (!Objects.equals(room.name(), SMOKETEST_ROOM_NAME)) {
+      stats.incrementBreaktimer(breaktimer);
+    }
+  }
+
+  private void incrementTimerStatsExceptForTestRoom(Room room, long timer) {
+    if (!Objects.equals(room.name(), SMOKETEST_ROOM_NAME)) {
+      stats.incrementTimer(timer);
+    }
+  }
+
   private static long truncateTooLongTimers(Long timer) {
     return Math.min(60 * 24, Math.max(0, timer));
   }