revert to chrome whoops

chiaryan · chiaryan · commit 1be60da0858d · 2024-11-12T16:06:25.000+08:00
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -19,7 +19,7 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2
-
+      
       - name: Set up .env
         env:
           QUESTION_FIREBASE_CREDENTIAL_PATH: ${{ vars.QUESTION_SERVICE_FIREBASE_CREDENTIAL_PATH }}
@@ -30,7 +30,7 @@ jobs:
           echo "FIREBASE_CREDENTIAL_PATH=$QUESTION_FIREBASE_CREDENTIAL_PATH" >> .env
           echo "JWT_SECRET=$JWT_SECRET" >> .env
           echo "EXECUTION_SERVICE_URL=$EXECUTION_SERVICE_URL" >> .env
-
+      
       - name: Set up credentials
         env:
           QUESTION_FIREBASE_JSON: ${{ secrets.QUESTION_SERVICE_FIREBASE_CREDENTIAL }}
@@ -41,8 +41,8 @@ jobs:
 
       - name: Setup Go
         uses: actions/setup-go@v5
-        with:
-          go-version: "1.23.x"
+        with: 
+          go-version: '1.23.x'
 
       - name: Install Go dependencies
         run: |
@@ -51,7 +51,7 @@ jobs:
 
       - name: Install firebase tools
         run: curl -sL firebase.tools | bash
-
+      
       - name: Run Go tests with Firebase emulator
         run: firebase emulators:exec --only firestore 'cd ./apps/question-service; go test -v ./tests'
 
@@ -66,11 +66,11 @@ jobs:
         run: |
           cd ./apps/frontend
           cp .env.example  .env
-
+      
       - name: Set up Node.js
         uses: actions/setup-node@v2
         with:
-          node-version: "22"
+          node-version: '22'
 
       - name: Install pnpm
         run: npm i -g pnpm
@@ -85,38 +85,160 @@ jobs:
           cd ./apps/frontend
           pnpm unit-test
 
-  test-webdriver-working:
+  test-docker-compose:
     runs-on: ubuntu-latest
 
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
 
+      - name: Set up Docker Compose
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y docker-compose
+
+      - name: Create Environment Files
+        env:
+          QUESTION_SERVICE_URL: ${{ vars.QUESTION_SERVICE_URL }}
+          USER_SERVICE_URL: ${{ vars.USER_SERVICE_URL }}
+          MATCHING_SERVICE_URL: ${{ vars.MATCHING_SERVICE_URL }}
+          HISTORY_SERVICE_URL: ${{ vars.HISTORY_SERVICE_URL }}
+          SIGNALLING_SERVICE_URL: ${{ vars.SIGNALLING_SERVICE_URL }}
+          EXECUTION_SERVICE_URL: ${{ vars.EXECUTION_SERVICE_URL }}
+          JWT_SECRET: ${{ secrets.JWT_SECRET }}
+          QUESTION_FIREBASE_CREDENTIAL_PATH: ${{ vars.QUESTION_SERVICE_FIREBASE_CREDENTIAL_PATH }}
+          HISTORY_FIREBASE_CREDENTIAL_PATH: ${{ vars.HISTORY_SERVICE_FIREBASE_CREDENTIAL_PATH }}
+          EXECUTION_FIREBASE_CREDENTIAL_PATH: ${{ vars.EXECUTION_SERVICE_FIREBASE_CREDENTIAL_PATH }}
+          DB_CLOUD_URI: ${{ secrets.USER_SERVICE_DB_CLOUD_URI }}
+          USER_SERVICE_PORT: ${{ vars.USER_SERVICE_PORT }}
+          MATCHING_SERVICE_PORT: ${{ vars.MATCHING_SERVICE_PORT }}
+          HISTORY_SERVICE_PORT: ${{ vars.HISTORY_SERVICE_PORT }}
+          SIGNALLING_SERVICE_PORT: ${{ vars.SIGNALLING_SERVICE_PORT }}
+          EXECUTION_SERVICE_PORT: ${{ vars.EXECUTION_SERVICE_PORT }}
+          MATCHING_SERVICE_TIMEOUT: ${{ vars.MATCHING_SERVICE_TIMEOUT }}
+          REDIS_URL: ${{ vars.REDIS_URL }}
+          QUESTION_SERVICE_GRPC_URL: ${{ vars.QUESTION_SERVICE_GPRC_URL }}
+        run: |
+          cd ./apps/frontend
+          echo "NEXT_PUBLIC_QUESTION_SERVICE_URL=$QUESTION_SERVICE_URL" >> .env
+          echo "NEXT_PUBLIC_USER_SERVICE_URL=$USER_SERVICE_URL" >> .env
+          echo "NEXT_PUBLIC_MATCHING_SERVICE_URL=$MATCHING_SERVICE_URL" >> .env
+          echo "NEXT_PUBLIC_HISTORY_SERVICE_URL=$HISTORY_SERVICE_URL" >> .env
+          echo "NEXT_PUBLIC_SIGNALLING_SERVICE_URL=$SIGNALLING_SERVICE_URL" >> .env
+          echo "NEXT_PUBLIC_EXECUTION_SERVICE_URL=EXECUTION_SERVICE_URL" >> .env
+
+          cd ../question-service
+          echo "FIREBASE_CREDENTIAL_PATH=$QUESTION_FIREBASE_CREDENTIAL_PATH" >> .env
+          echo "JWT_SECRET=$JWT_SECRET" >> .env
+          echo "EXECUTION_SERVICE_URL=$EXECUTION_SERVICE_URL" >> .env
+
+          cd ../user-service
+          echo "DB_CLOUD_URI=$DB_CLOUD_URI" >> .env
+          echo "PORT=$USER_SERVICE_PORT" >> .env
+          echo "JWT_SECRET=$JWT_SECRET" >> .env
+
+          cd ../matching-service
+          echo "PORT=$MATCHING_SERVICE_PORT" >> .env
+          echo "MATCH_TIMEOUT=$MATCHING_SERVICE_TIMEOUT" >> .env
+          echo "JWT_SECRET=$JWT_SECRET" >> .env
+          echo "REDIS_URL=$REDIS_URL" >> .env
+          echo "QUESTION_SERVICE_GRPC_URL=$QUESTION_SERVICE_GRPC_URL" >> .env
+
+          cd ../history-service
+          echo "FIREBASE_CREDENTIAL_PATH=$HISTORY_FIREBASE_CREDENTIAL_PATH" >> .env
+          echo "PORT=$HISTORY_SERVICE_PORT" >> .env
+          
+          cd ../execution-service
+          echo "FIREBASE_CREDENTIAL_PATH=$EXECUTION_FIREBASE_CREDENTIAL_PATH" >> .env
+          echo "PORT=$EXECUTION_SERVICE_PORT" >> .env
+          echo "HISTORY_SERVICE_URL=$HISTORY_SERVICE_URL" >> .env
+
+          cd ../signalling-service
+          echo "PORT=$SIGNALLING_SERVICE_PORT" >> .env
+
+      - name: Create Database Credential Files
+        env:
+          QUESTION_FIREBASE_JSON: ${{ secrets.QUESTION_SERVICE_FIREBASE_CREDENTIAL }}
+          QUESTION_FIREBASE_CREDENTIAL_PATH: ${{ vars.QUESTION_SERVICE_FIREBASE_CREDENTIAL_PATH }}
+          HISTORY_FIREBASE_JSON: ${{ secrets.HISTORY_SERVICE_FIREBASE_CREDENTIAL }}
+          HISTORY_FIREBASE_CREDENTIAL_PATH: ${{ vars.HISTORY_SERVICE_FIREBASE_CREDENTIAL_PATH }}
+          EXECUTION_FIREBASE_JSON: ${{ secrets.EXECUTION_SERVICE_FIREBASE_CREDENTIAL }}
+          EXECUTION_FIREBASE_CREDENTIAL_PATH: ${{ vars.EXECUTION_SERVICE_FIREBASE_CREDENTIAL_PATH }}
+        run: |
+          cd ./apps/question-service
+          echo "$QUESTION_FIREBASE_JSON" > "./$QUESTION_FIREBASE_CREDENTIAL_PATH"
+
+          cd ../history-service
+          echo "$HISTORY_FIREBASE_JSON" > "./$HISTORY_FIREBASE_CREDENTIAL_PATH"
+          
+          cd ../execution-service
+          echo "$EXECUTION_FIREBASE_JSON" > "./$EXECUTION_FIREBASE_CREDENTIAL_PATH"
+
+      - name: Build and Run Services
+        run: |
+          cd ./apps
+          docker-compose up --build -d
+
+      - name: Wait for services to be ready
+        run: sleep 30
+
+      - name: Install websocat
+        run: |
+          sudo wget -qO /usr/local/bin/websocat https://github.com/vi/websocat/releases/latest/download/websocat.x86_64-unknown-linux-musl
+          sudo chmod a+x /usr/local/bin/websocat
+          websocat --version
+
+      - name: Run Tests
+        env:
+          FRONTEND_URL: ${{ vars.FRONTEND_URL }}
+          USER_SERVICE_URL: ${{ vars.USER_SERVICE_URL }}
+          QUESTION_SERVICE_URL: ${{ vars.QUESTION_SERVICE_URL }}
+          MATCHING_SERVICE_URL: ${{ vars.MATCHING_SERVICE_URL }}
+          HISTORY_SERVICE_URL: ${{ vars.HISTORY_SERVICE_URL }}
+          SIGNALLING_SERVICE_URL: ${{ vars.SIGNALLING_SERVICE_URL }}
+          EXECUTION_SERVICE_URL: ${{ vars.EXECUTION_SERVICE_URL }}
+        run: |
+          echo "Testing Question Service..."
+          curl -sSL -o /dev/null $QUESTION_SERVICE_URL && echo "Question Service is up"
+          echo "Testing User Service..."
+          curl -fsSL -o /dev/null $USER_SERVICE_URL && echo "User Service is up"
+          echo "Testing Frontend..."
+          curl -fsSL -o /dev/null $FRONTEND_URL && echo "Frontend is up"
+          echo "Testing History Service..."
+          curl -fsSL -o /dev/null $HISTORY_SERVICE_URL && echo "History Service is up"
+          echo "Testing Execution Service..."
+          curl -fsSL -o /dev/null $EXECUTION_SERVICE_URL && echo "Execution Service is up"
+          echo "Testing Matching Service..."
+          if ! (echo "Hello" | websocat $MATCHING_SERVICE_URL); then
+            echo "WebSocket for Matching Service is not live"
+          else
+            echo "WebSocket for Matching Service is live"
+          fi
+          # Add in test for matching service in the future
+          echo "Testing Signalling Service..."
+          if ! (echo "Hello" | websocat $SIGNALLING_SERVICE_URL); then
+            echo "WebSocket for Signalling Service is not live"
+          else
+            echo "WebSocket for Signalling Service is live"
+          fi
+          # We can add more tests here
+      
       - name: Install pnpm
         uses: pnpm/action-setup@v4
         with:
           version: 9.1.4
-  
+
       - name: Install dependencies
         run: |
           cd ./apps/frontend
           pnpm i
-          
+      
       - name: Install Chrome WebDriver
         uses: nanasess/setup-chromedriver@v2
         with:
           chromedriver-version: '130.0.6723.116'
-      
-      - name: Install Edge
-        uses: browser-actions/setup-edge@v1
-        with:
-          edge-version: stable
-      
-      - name: Install Geckodriver
-        uses: browser-actions/setup-geckodriver@latest
-      
+
       - name: Run Browser Test
         run: |
           cd ./apps/frontend
-          pnpm browser-test -t "webdriver installed correctly"
-
+          pnpm browser-test
diff --git a/apps/frontend/__tests__/browser-tests/browser.test.ts b/apps/frontend/__tests__/browser-tests/browser.test.ts
@@ -1,60 +1,37 @@
-import { Actions, Browser, Builder, By, Capabilities, Key, until, WebDriver } from "selenium-webdriver"
-
-import {Options as ChromeOptions} from "selenium-webdriver/chrome"
-import {Options as EdgeOptions} from "selenium-webdriver/edge"
-import {Options as FirefoxOptions} from "selenium-webdriver/firefox"
+import { Actions, Browser, Builder, By, Key, until, WebDriver } from "selenium-webdriver"
 
+import Chrome from "selenium-webdriver/chrome"
 const URL = 'http://localhost:3000/';
 const ETERNAL_JWT = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyLCJleHAiOjk5OTk5OTk5OTk5fQ.Z4_FVGQ5lIcouP3m4YLMr6pGMF17IJFfo2yOTiN58DY"
 
-const CHROME_OPTIONS = new ChromeOptions()
-    .addArguments("--headless=new") as ChromeOptions; // uncomment locally to see the steps in action
-const EDGE_OPTIONS = new EdgeOptions()
-    .setBinaryPath("/opt/hostedtoolcache/msedge/stable/x64/msedge") // need to point to the correct path
-    .addArguments("--headless=new") as EdgeOptions;
-
-const FIREFOX_OPTIONS = new FirefoxOptions()
-    .addArguments("--headless") as FirefoxOptions;
-
-const builder = new Builder()
-    .setChromeOptions(CHROME_OPTIONS)
-    .setEdgeOptions(EDGE_OPTIONS)
-    .setFirefoxOptions(FIREFOX_OPTIONS)
-
-describe.each([Browser.CHROME, Browser.EDGE, Browser.FIREFOX])("%s driver test", (browser) => {
+describe("chrome browser", () => {
+    const options = new Chrome.Options()
+    .addArguments("--headless=new") as Chrome.Options; // uncomment locally to see the steps in action
+    const builder = new Builder().forBrowser(Browser.CHROME).setChromeOptions(options);
     let driver: WebDriver;
-    beforeAll(() => {
-        const cap = new Capabilities().setBrowserName(browser)
-        builder.withCapabilities(cap);
-    })
 
     beforeEach(async () => {
-        console.log(browser + ": building...");
         driver = await builder.build();
-        console.log(browser + ": built");
-    }, 10000)
+    })
 
     afterEach(async () => {
-        if (driver) {
-            await driver.quit();
-        }
+        await driver.quit();
     })
 
-    describe("webdriver installed correctly", () => {
+    describe("chrome webdriver installed correctly", () => {
         it("does google search", async () => {
             await driver.get('http://www.google.com');
             await driver.findElement(By.name('q')).sendKeys('webdriver', Key.RETURN);
             await driver.wait(until.titleIs('webdriver - Google Search'), 1000);
         }, 10000);
-
-        it.skip("does another google search", async () => {
+        it("does another google search", async () => {
             await driver.get('http://www.google.com');
             await driver.findElement(By.name('q')).sendKeys('webdriver', Key.RETURN);
             await driver.wait(until.titleIs('webdriver - Google Search'), 1000);
         }, 10000);
     });
     
-    describe.skip("browser-test", () => {
+    describe("browser-test", () => {
         it("accesses and login to peerprep", async () => {
             await driver.get(URL);
             await driver.wait(until.urlIs(`${URL}login`));
@@ -75,8 +52,7 @@ describe.each([Browser.CHROME, Browser.EDGE, Browser.FIREFOX])("%s driver test",
             expect(slogan2).toBe("peers");
         }, 10000);
     })
-}, 20000)
-
+})
 
 
 
