Refactor workflow into jobs

.dockerignore

@@ -0,0 +1 @@
+node_modules/

.github/workflows/add_issue_to_triage_board.yml

@@ -3,9 +3,9 @@ on:
   issues:
     types:
       - opened
-  pull_request_target:
-    types:
-      - opened
+  #pull_request_target:
+   # types:
+     # - opened
 jobs:
   add-to-triage-project-board:
     uses: cypress-io/cypress/.github/workflows/triage_add_to_project.yml@develop

.github/workflows/main.yml

@@ -1,9 +1,6 @@
 name: Cypress Tests
 
-on:
-  push:
-    branches-ignore:
-      - "renovate/**"
+on: [pull_request]
 
 jobs:
   install:

.github/workflows/shipyard.yml

@@ -0,0 +1,56 @@
+name: Run E2E Tests
+
+on: [push]
+
+jobs:
+  init-cypress:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Cypress install
+        uses: cypress-io/github-action@v6
+        with:
+          runTests: false
+      - name: Save build folder
+        uses: actions/upload-artifact@v3
+        with:
+          name: build
+          if-no-files-found: error
+          path: dist
+
+      - run: yarn cypress info
+      - run: node --version
+      - run: node -p 'os.cpus()'
+      - run: yarn types
+  init-app:
+    steps:
+      - name: Install Node.js
+        uses: actions/setup-node@v1
+        with:
+          node-version: '18.16.1'
+      - name: Install dependencies
+        run: yarn install
+  init-environment:
+    steps:
+      - name: Integrate Shipyard
+        uses: shipyard/github-action/[email protected]
+        with:
+          api-token: ${{ secrets.SHIPYARD_API_TOKEN }}
+          timeout-minutes: "10"
+          app-name: "cypress-realworld-app"
+      - name: Print Env Data
+        run: |
+          echo "CYPRESS_BASE_URL=${SHIPYARD_ENVIRONMENT_URL}" >> $GITHUB_ENV
+          echo "CYPRESS_BYPASS_TOKEN=${SHIPYARD_BYPASS_TOKEN}" >> $GITHUB_ENV
+          env | grep -e SHIPYARD -e CYPRESS
+        shell: bash
+      - name: Run E2E tests against the ephemeral environment
+        run: |
+          echo $SHIPYARD_ENVIRONMENT_URL
+          yarn cypress:run --spec "cypress/tests/shipyard/manage-user.spec.ts"
+        shell: bash
+        env:
+            CYPRESS_BASE_URL: ${{ env.CYPRESS_BASE_URL }}
+            CYPRESS_BYPASS_TOKEN: ${{ env.CYPRESS_BYPASS_TOKEN }}

.prettierrc

@@ -1,5 +1,5 @@
 {
   "trailingComma": "es5",
-  "printWidth": 100,
+  "printWidth": 160,
   "endOfLine": "auto"
 }

.yarn/releases/yarn-1.22.19.cjs

@@ -96321,7 +96321,7 @@ let main = exports.main = (() => {
       return new Promise(function (resolve, reject) {
         const connectionOptions = {
           port: +mutexPort || (_constants || _load_constants()).SINGLE_INSTANCE_PORT,
-          host: 'localhost'
+          host: '0.0.0.0'
         };
 
         function startServer() {

Dockerfile

@@ -0,0 +1,11 @@
+FROM node:18.16.1-alpine AS build
+WORKDIR /app
+
+COPY package.json yarn.lock .yarnrc vite.config.ts ./
+
+RUN PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true yarn install
+
+COPY . .
+
+# start app
+CMD ["yarn", "dev"]

backend/app.ts

@@ -28,7 +28,7 @@ import { frontendPort, getBackendPort } from "../src/utils/portUtils";
 require("dotenv").config();
 
 const corsOption = {
-  origin: `http://localhost:${frontendPort}`,
+  origin: process.env.SHIPYARD_DOMAIN_FRONTEND ? `https://${process.env.SHIPYARD_DOMAIN_FRONTEND}` : `http://localhost:${frontendPort}`,
   credentials: true,
 };
 

backend/database.ts

@@ -86,7 +86,7 @@ const COMMENT_TABLE = "comments";
 const NOTIFICATION_TABLE = "notifications";
 const BANK_TRANSFER_TABLE = "banktransfers";
 
-const databaseFile = path.join(__dirname, "../data/database.json");
+const databaseFile = path.join(__dirname, "../data/database/database.json");
 const adapter = new FileSync<DbSchema>(databaseFile);
 
 const db = low(adapter);

cypress.config.ts

@@ -10,19 +10,23 @@ import { defineConfig } from "cypress";
 dotenv.config({ path: ".env.local" });
 dotenv.config();
 
-const awsConfig = require(path.join(__dirname, "./aws-exports-es5.js"));
+//const awsConfig = require(path.join(__dirname, "./aws-exports-es5.js"));
 
 module.exports = defineConfig({
   projectId: "7s5okt",
+  video: true,
   retries: {
     runMode: 2,
   },
   env: {
-    apiUrl: "http://localhost:3001",
+    apiUrl: `${process.env.SHIPYARD_DOMAIN_BACKEND}`,
+    url: `${process.env.SHIPYARD_DOMAIN_BACKEND}`,
+    //apiUrl: "http://backend:3001",
+    //url: "http://backend:3001",
     mobileViewportWidthBreakpoint: 414,
     coverage: false,
     codeCoverage: {
-      url: "http://localhost:3001/__coverage__",
+      url: `${process.env.SHIPYARD_DOMAIN_BACKEND}/__coverage__`,
       exclude: "cypress/**/*.*",
     },
     defaultPassword: process.env.SEED_DEFAULT_USER_PASSWORD,
@@ -41,11 +45,11 @@ module.exports = defineConfig({
     okta_programmatic_login: process.env.OKTA_PROGRAMMATIC_LOGIN || false,
 
     // Amazon Cognito
-    cognito_username: process.env.AWS_COGNITO_USERNAME,
-    cognito_password: process.env.AWS_COGNITO_PASSWORD,
-    cognito_domain: process.env.AWS_COGNITO_DOMAIN,
+    cognito_username: process.env._COGNITO_USERNAME,
+    cognito_password: process.env._COGNITO_PASSWORD,
+    cognito_domain: process.env._COGNITO_DOMAIN,
     cognito_programmatic_login: false,
-    awsConfig: awsConfig.default,
+    //awsConfig: awsConfig.default,
 
     // Google
     googleRefreshToken: process.env.GOOGLE_REFRESH_TOKEN,
@@ -65,7 +69,7 @@ module.exports = defineConfig({
     },
   },
   e2e: {
-    baseUrl: "http://localhost:3000",
+    baseUrl: `https://${process.env.SHIPYARD_DOMAIN_FRONTEND}`,
     specPattern: "cypress/tests/**/*.spec.{js,jsx,ts,tsx}",
     supportFile: "cypress/support/e2e.ts",
     viewportHeight: 1000,

cypress/tests/shipyard/manage-user.spec.ts

@@ -0,0 +1,101 @@
+import { User } from "models";
+
+describe("Create new user", function () {
+  beforeEach(function () {
+    //console.log(process.env.SHIPYARD_DOMAIN_FRONTEND)
+    const urlToVisit = "/signup";
+    cy.visit(urlToVisit);
+    cy.url().then((url) => {
+      cy.log(`Current URL: ${url}`);
+    });
+    //cy.task("db:seed");
+  });
+  // go to sign up page and register
+  it("should create a new user", function () {
+    //cy.visit('/signup')
+    // tracking using a random ID
+    const userId = Cypress._.random(1000, 9999);
+    const username = `user${userId}`;
+    const firstName = `Name${userId}`
+    const lastName = `T${userId}`
+    cy.get("input[name='username']").type(username);
+    cy.get("input[name='firstName']").type(firstName);
+    cy.get("input[name='lastName']").type(lastName);
+    // only field that really matters is username because uses ID
+    // maybe we track user by the auto assigned ID instead of username?
+    cy.get("input[name='password']").type("testingPwd");
+    cy.get("input[name='confirmPassword']").type("testingPwd");
+
+    // add user to db
+    cy.get("button[type='submit']").click();
+
+    // want to change this to check for most recent entry, but stuck
+    // adds the user to the middle of the db
+    // maybe we sort db by date-created field
+    /*cy.database("find", "users", { username: username }).then((user: User) => {
+      expect(user.username).to.equal(username);
+    });*/
+  });
+});
+//want to pretend you have rolled back to prev snap
+// create a user and go to snap where user no longer exists
+//click trash = all data will be deleted
+//next run = the database will be pop with basic contents
+//itll be as if youve rolled back
+
+/*
+describe("Edit existing user", function () {
+    const testEmail = "[email protected]"
+    beforeEach(function () {
+      const urlToVisit = "/";
+      cy.visit(urlToVisit);
+      //cy.task("db:seed");
+
+      cy.intercept("PATCH", "/users/*").as("updateUser");
+      cy.intercept("GET", "/notifications*").as("getNotifications");
+
+      cy.database("find", "users", { email: testEmail }).then((user) => {
+        if (user) {
+          cy.loginByXstate(user.username);
+        }
+      });
+
+      cy.getBySel("sidenav-user-settings").click();
+
+    });
+    it("should edit an existing user", function () {
+      cy.visit('/user/settings')
+      // tracking using a random ID
+      const userId = Cypress._.random(1000, 9999);
+      const newName = `Name${userId}`
+      const newLast = `T${userId}`
+      const newEmail = `${newName}@gmail.com`
+      const newNumber = "415-555-8992"
+      // clear fields
+      cy.get("input[name='firstName']").clear();
+      cy.get("input[name='lastName']").clear();
+      cy.get("input[name='email']").clear();
+      cy.get("input[name='phoneNumber']").clear();  
+      // type inputs
+      cy.get("input[name='firstName']").type(newName);
+      cy.get("input[name='lastName']").type(newLast);
+      cy.get("input[name='email']").type(newEmail);
+      cy.get("input[name='phoneNumber']").type(newNumber);  
+      // edit user in db
+      cy.get("button[type='submit']").click();
+
+      cy.database("find", "users", { email: newEmail })
+      .then((user: User) => {
+        if (user) {
+          cy.log(`Found user with email: ${user.email}`);
+          expect(user.email).to.equal(newEmail);
+          expect(user.firstName).to.equal(newName);
+          expect(user.lastName).to.equal(newLast);
+          expect(user.phoneNumber).to.equal(newNumber);
+        } else {
+          cy.log(`User with email "${testEmail}" not found in the database.`);
+        }
+      })
+    });
+  });
+*/

dist

@@ -0,0 +1 @@
+

docker-compose.yml

@@ -0,0 +1,32 @@
+version: '3'
+
+services:
+  frontend:
+    build:
+      context: '.'
+    labels:
+      shipyard.route: '/'
+      shipyard.primary-route: 'true'
+    environment:
+        SHIPYARD_DOMAIN_BACKEND: ${SHIPYARD_DOMAIN_BACKEND-}
+    ports:
+      - '3000:3000'
+    env_file:
+      - .env
+
+  backend:
+    build:
+      context: '.'
+    labels:
+      shipyard.route: '/api'
+    environment:
+        SHIPYARD_DOMAIN_FRONTEND: ${SHIPYARD_DOMAIN_FRONTEND-}
+    ports:
+      - '3001:3001'
+    volumes:
+      - 'dbdata:/app/data/database'
+    env_file:
+      - .env
+
+volumes:
+  dbdata: