Skip to content

Commit

Permalink
implemented comments
Browse files Browse the repository at this point in the history
  • Loading branch information
DmByK committed Jul 12, 2024
1 parent 5c18984 commit 9533e45
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 18 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/code-quality.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,7 @@ jobs:
chmod +x ./init/elasticsearch/init.sh
sed -i 's/- \.\/volumes\/elasticsearch\/data:\/usr\/share\/elasticsearch\/data//g' ./docker-compose.yaml
docker compose up -d db oidc elasticsearch
sleep 120
docker compose logs elasticsearch
sleep 60
- name: Migrate database
run: npm run prisma -- migrate deploy
- name: Restore cached e2e node modules
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ The following components must be installed on the development computer:
Follow these steps to set up the development environment on your local machine:

- [1. Configure Local Systems](#1-Configure-Local-Systems)
- [3. Install Dependencies](#2-Install-Dependencies)
- [4. Generate Database Types](#3-Generate-Database-Types)
- [5. Initialize MinIO](#4-Initialize-MinIO)
- [2. Install Dependencies](#2-Install-Dependencies)
- [3. Generate Database Types](#3-Generate-Database-Types)
- [4. Initialize MinIO](#4-Initialize-MinIO)

#### 1. Configure Local Systems

Expand Down
1 change: 0 additions & 1 deletion e2e/cypress/e2e/common/give-admin-perm.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import { assetsBaseUrl } from '../../support/config/config';
Given('User has admin permissions', () => {
const command = `docker exec -i swissgeol-assets-postgres psql -U postgres -d postgres -a -f ./give_admin_perm.sql`;
cy.exec(command).then((result) => {
console.log(result);
expect(result.code).to.eq(0); // Asserts that the command ran successfully
});
cy.visit(assetsBaseUrl);
Expand Down
12 changes: 0 additions & 12 deletions e2e/cypress/support/commands/helper.commands.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,18 +33,6 @@ Cypress.Commands.add('login', (username: string, password: string) => {
.then((token) => window.localStorage.setItem('access_token', token));
},
{
/* validate() {
cy.window()
.then((win) => win.localStorage.getItem('access_token'))
.as('access_token');
cy.get('@access_token').then((token) =>
cy.request({
method: 'GET',
url: '/api/user',
auth: bearerAuth(token),
})
);
},*/
cacheAcrossSpecs: true,
}
);
Expand Down

0 comments on commit 9533e45

Please sign in to comment.