Skip to content

Commit 6f725df

Browse files
Merge branch 'G-Research:main' into auto-approve
2 parents ecf2343 + 96a35aa commit 6f725df

File tree

20 files changed

+397
-151
lines changed

20 files changed

+397
-151
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
npm run test-coverage-ci --workspaces --if-present
5353
5454
- name: Upload test coverage report
55-
uses: codecov/codecov-action@13ce06bfc6bbe3ecf90edbbf1bc32fe5978ca1d3 # v5.3.1
55+
uses: codecov/codecov-action@0565863a31f2c772f9f0395002a31e3f06189574 # v5.4.0
5656
with:
5757
files: ./coverage/lcov.info
5858
token: ${{ secrets.CODECOV_TOKEN }}
@@ -71,13 +71,13 @@ jobs:
7171
path: build
7272

7373
- name: Download the build folders
74-
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4
74+
uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4
7575
with:
7676
name: build
7777
path: build
7878

7979
- name: Run cypress test
80-
uses: cypress-io/github-action@18a6541367f4580a515371905f499a27a44e8dbe # v6.7.12
80+
uses: cypress-io/github-action@108b8684ae52e735ff7891524cbffbcd4be5b19f # v6.7.16
8181
with:
8282
start: npm start &
8383
wait-on: "http://localhost:3000"

.github/workflows/codeql.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060

6161
# Initializes the CodeQL tools for scanning.
6262
- name: Initialize CodeQL
63-
uses: github/codeql-action/init@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3
63+
uses: github/codeql-action/init@6bb031afdd8eb862ea3fc1848194185e076637e5 # v3
6464
with:
6565
languages: ${{ matrix.language }}
6666
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -74,7 +74,7 @@ jobs:
7474
# Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
7575
# If this step fails, then you should remove it and run the build manually (see below)
7676
- name: Autobuild
77-
uses: github/codeql-action/autobuild@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3
77+
uses: github/codeql-action/autobuild@6bb031afdd8eb862ea3fc1848194185e076637e5 # v3
7878

7979
# ℹ️ Command-line programs to run using the OS shell.
8080
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -87,6 +87,6 @@ jobs:
8787
# ./location_of_script_within_repo/buildscript.sh
8888

8989
- name: Perform CodeQL Analysis
90-
uses: github/codeql-action/analyze@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3
90+
uses: github/codeql-action/analyze@6bb031afdd8eb862ea3fc1848194185e076637e5 # v3
9191
with:
9292
category: "/language:${{matrix.language}}"

.github/workflows/scorecard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,6 @@ jobs:
7272

7373
# Upload the results to GitHub's code scanning dashboard.
7474
- name: "Upload to code-scanning"
75-
uses: github/codeql-action/upload-sarif@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
75+
uses: github/codeql-action/upload-sarif@6bb031afdd8eb862ea3fc1848194185e076637e5 # v3.28.11
7676
with:
7777
sarif_file: results.sarif

cypress.config.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
const { defineConfig } = require('cypress')
1+
const { defineConfig } = require('cypress');
22

33
module.exports = defineConfig({
44
e2e: {
5-
baseUrl: process.env.CYPRESS_BASE_URL ||'http://localhost:3000',
5+
baseUrl: process.env.CYPRESS_BASE_URL || 'http://localhost:3000',
6+
chromeWebSecurity: false, // Required for OIDC testing
67
},
7-
})
8+
});

cypress/e2e/login.cy.js

Lines changed: 32 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,33 @@
1-
describe("Display finos UI",()=>{
2-
3-
beforeEach(() =>{
4-
cy.visit('/login')
5-
})
6-
it('shoud find git proxy logo',() =>{
7-
cy.get('[data-test="git-proxy-logo"]').should('exist')
8-
})
9-
it('shoud find username',() =>{
10-
cy.get('[data-test="username"]').should('exist')
11-
})
1+
describe('Login page', () => {
2+
beforeEach(() => {
3+
cy.visit('/login');
4+
});
125

13-
it('shoud find passsword',() =>{
14-
cy.get('[data-test="password"]').should('exist')
15-
})
16-
it('shoud find login button',() =>{
17-
cy.get('[data-test="login"]').should('exist')
18-
})
19-
})
6+
it('should have git proxy logo', () => {
7+
cy.get('[data-test="git-proxy-logo"]').should('exist');
8+
});
9+
10+
it('should have username input', () => {
11+
cy.get('[data-test="username"]').should('exist');
12+
});
13+
14+
it('should have passsword input', () => {
15+
cy.get('[data-test="password"]').should('exist');
16+
});
17+
18+
it('should have login button', () => {
19+
cy.get('[data-test="login"]').should('exist');
20+
});
21+
22+
describe('OIDC login button', () => {
23+
it('should exist', () => {
24+
cy.get('[data-test="oidc-login"]').should('exist');
25+
});
26+
27+
// Validates that OIDC is configured correctly
28+
it('should redirect to /oidc', () => {
29+
cy.get('[data-test="oidc-login"]').click();
30+
cy.url().should('include', '/oidc');
31+
});
32+
});
33+
});

0 commit comments

Comments
 (0)