-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #144 from COS301-SE-2023/hotfix/v0.1.0
Hotfix/v0.1.0 to Main
- Loading branch information
Showing
40 changed files
with
1,612 additions
and
189 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1 change: 0 additions & 1 deletion
1
apps/api/src/main/java/com/fridgetoplate/repository/IngredientRepository.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,69 @@ | ||
| import { getGreeting } from "../support/app.po"; | ||
| import { data } from 'cypress/types/jquery'; | ||
| import { getGreeting } from '../support/app.po'; | ||
|
|
||
| describe("app", () => { | ||
| beforeEach(() => cy.visit("/")); | ||
| describe('login tests', () => { | ||
| beforeEach(() => cy.visit('/')); | ||
|
|
||
| it("should display welcome message", () => { | ||
| // Custom command example, see `../support/commands.ts` file | ||
| cy.login("my-email@something.com", "myPassword"); | ||
| // it('successfully loads login', () => { | ||
| // cy.get('h1').contains('Hey, Welcome Back'); | ||
| // }); | ||
|
|
||
| // Function helper example, see `../support/app.po.ts` file | ||
| getGreeting().contains("Welcome app"); | ||
| }); | ||
| // it('should prevent incorrect login attempt', () => { | ||
| // cy.fixture('user-details.json').then((userData) => { | ||
| // cy.get('input[name="username"]').type(userData.username); | ||
| // cy.get('input[name="password"]').type(userData.password); | ||
| // cy.get('button').click(); | ||
| // cy.url().contains('profile'); | ||
| // }); | ||
| // }); | ||
|
|
||
| // it('should attempt login', () => { | ||
| // cy.get('input[name="username"]').type('smileyazola@gmail.com'); | ||
| // cy.get('input[name="password"]').type('randomPassword!'); | ||
| // cy.get('button').click(); | ||
| // cy.url().contains('profile'); | ||
| // }); | ||
|
|
||
| // it('should navigate to signup', () => { | ||
| // cy.get('button').click(); | ||
| // cy.url().contains('signup'); | ||
| // }); | ||
| }); | ||
|
|
||
| describe('signup tests', () => { | ||
| beforeEach(() => cy.visit('/')); | ||
| }); | ||
| // it('successfully loads signup', () => { | ||
| // cy.get('h1').contains('Hey, Welcome Back'); | ||
| // }); | ||
|
|
||
| // it('should attempt signup', () => { | ||
| // cy.fixture('user-details.json').then((userData) => { | ||
| // cy.get('input[name="username"]').type(userData.username); | ||
| // cy.get('input[name="password"]').type(userData.password); | ||
| // cy.get('button').click(); | ||
| // cy.url().contains('profile'); | ||
| // }); | ||
| // }); | ||
|
|
||
| // it('should navigate to login', () => { | ||
| // cy.get('button').click(); | ||
| // cy.url().contains('login'); | ||
| // }); | ||
| // }); | ||
|
|
||
| describe('profile tests', () => { | ||
| beforeEach(() => cy.visit('/')); | ||
| }); | ||
|
|
||
| describe('create tests', () => { | ||
| beforeEach(() => cy.visit('/')); | ||
| }); | ||
|
|
||
| describe('generate tests', () => { | ||
| beforeEach(() => cy.visit('/')); | ||
| }); | ||
|
|
||
| describe('details tests', () => { | ||
| beforeEach(() => cy.visit('/')); | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| [ | ||
| { | ||
| "username": "First", | ||
| "password": "Password1!" | ||
| }, | ||
| { | ||
| "username": "Second", | ||
| "password": "Password2!" | ||
| } | ||
| ] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| import { defineConfig } from 'cypress'; | ||
| import { nxE2EPreset } from '@nrwl/cypress/plugins/cypress-preset'; | ||
|
|
||
| export default defineConfig({ | ||
| e2e: nxE2EPreset(__dirname, { | ||
| cypressDir: 'cypress', | ||
| }), | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| describe('login tests', () => { | ||
| beforeEach(() => cy.visit('/')); | ||
|
|
||
| it('successfully loads login', () => { | ||
| cy.get('h1').contains('Hey, Welcome Back'); | ||
| }); | ||
|
|
||
| // it('should prevent incorrect login attempt', () => { | ||
| // cy.fixture('user-details.json').then((userData) => { | ||
| // cy.get('input[name="username"]').type(userData.username); | ||
| // cy.get('input[name="password"]').type(userData.password); | ||
| // cy.get('button').click(); | ||
| // cy.url().contains('profile'); | ||
| // }); | ||
| // }); | ||
|
|
||
| // it('should attempt login', () => { | ||
| // cy.get('input[name="username"]').type('smileyazola@gmail.com'); | ||
| // cy.get('input[name="password"]').type('randomPassword!'); | ||
| // cy.get('button').click(); | ||
| // cy.url().contains('profile'); | ||
| // }); | ||
|
|
||
| // it('should navigate to signup', () => { | ||
| // cy.get('button').click(); | ||
| // cy.url().contains('signup'); | ||
| // }); | ||
| // }); | ||
|
|
||
| // describe('signup tests', () => { | ||
| // beforeEach(() => cy.visit('/')); | ||
|
|
||
| // it('successfully loads signup', () => { | ||
| // cy.get('h1').contains('Hey, Welcome Back'); | ||
| // }); | ||
|
|
||
| // it('should attempt signup', () => { | ||
| // cy.fixture('user-details.json').then((userData) => { | ||
| // cy.get('input[name="username"]').type(userData.username); | ||
| // cy.get('input[name="password"]').type(userData.password); | ||
| // cy.get('button').click(); | ||
| // cy.url().contains('profile'); | ||
| // }); | ||
| // }); | ||
|
|
||
| // it('should navigate to login', () => { | ||
| // cy.get('button').click(); | ||
| // cy.url().contains('login'); | ||
| // }); | ||
| }); | ||
|
|
||
| describe('profile tests', () => { | ||
| beforeEach(() => cy.visit('/')); | ||
| cy.get('h1').contains('Hey, Welcome Back'); | ||
| }); | ||
|
|
||
| describe('create tests', () => { | ||
| beforeEach(() => cy.visit('/')); | ||
| cy.get('h1').contains('Hey, Welcome Back'); | ||
| }); | ||
|
|
||
| describe('generate tests', () => { | ||
| beforeEach(() => cy.visit('/')); | ||
| cy.get('h1').contains('Hey, Welcome Back'); | ||
| }); | ||
|
|
||
| describe('details tests', () => { | ||
| beforeEach(() => cy.visit('/')); | ||
| cy.get('h1').contains('Hey, Welcome Back'); | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| { | ||
| "name": "Using fixtures to represent data", | ||
| "email": "hello@cypress.io" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| export const getGreeting = () => cy.get('h1'); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| // *********************************************** | ||
| // This example commands.js shows you how to | ||
| // create various custom commands and overwrite | ||
| // existing commands. | ||
| // | ||
| // For more comprehensive examples of custom | ||
| // commands please read more here: | ||
| // https://on.cypress.io/custom-commands | ||
| // *********************************************** | ||
|
|
||
| // eslint-disable-next-line @typescript-eslint/no-namespace | ||
| declare namespace Cypress { | ||
| // eslint-disable-next-line @typescript-eslint/no-unused-vars | ||
| interface Chainable<Subject> { | ||
| login(email: string, password: string): void; | ||
| } | ||
| } | ||
| // | ||
| // -- This is a parent command -- | ||
| Cypress.Commands.add('login', (email, password) => { | ||
| console.log('Custom command example: Login', email, password); | ||
| }); | ||
| // | ||
| // -- This is a child command -- | ||
| // Cypress.Commands.add("drag", { prevSubject: 'element'}, (subject, options) => { ... }) | ||
| // | ||
| // | ||
| // -- This is a dual command -- | ||
| // Cypress.Commands.add("dismiss", { prevSubject: 'optional'}, (subject, options) => { ... }) | ||
| // | ||
| // | ||
| // -- This will overwrite an existing command -- | ||
| // Cypress.Commands.overwrite("visit", (originalFn, url, options) => { ... }) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| // *********************************************************** | ||
| // This example support/index.js is processed and | ||
| // loaded automatically before your test files. | ||
| // | ||
| // This is a great place to put global configuration and | ||
| // behavior that modifies Cypress. | ||
| // | ||
| // You can change the location of this file or turn off | ||
| // automatically serving support files with the | ||
| // 'supportFile' configuration option. | ||
| // | ||
| // You can read more here: | ||
| // https://on.cypress.io/configuration | ||
| // *********************************************************** | ||
|
|
||
| // Import commands.js using ES2015 syntax: | ||
| import './commands'; |
Oops, something went wrong.