Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
0d15da6
Add new integration test, integration.yml
JCantu248 Jan 22, 2025
7b7bab4
vulnerabilities tests
jyang2139 Jan 28, 2025
21cb495
fixed tests
jyang2139 Jan 28, 2025
fb459ed
put test update
jyang2139 Jan 29, 2025
6fe3611
test
jyang2139 Jan 29, 2025
41a384c
Add method to return domain, vulnerability uids for other test cases.
JCantu248 Jan 30, 2025
15c37a7
updated test for new methods
jyang2139 Jan 30, 2025
f6ab796
Change get_domains, get_vulnerabilities to return entire object, not …
JCantu248 Feb 3, 2025
76d2a92
updates to id method
jyang2139 Feb 3, 2025
ebd4add
fixing environment variable
jyang2139 Feb 4, 2025
a083545
Merge pull request #774 from cisagov/jy_integration_tests
JCantu248 Feb 4, 2025
3df9356
Code cleanup for test_vulnerabilities.py.
JCantu248 Feb 5, 2025
dc09d63
Testing integration workflow on push.
JCantu248 Feb 6, 2025
bfd732a
Add requirements.txt, changes to test_domains.
JCantu248 Feb 6, 2025
17db7c3
Update integration.yml
aloftus23 Feb 6, 2025
c8454f6
Reverting integration.yml to only on deployment status.
JCantu248 Feb 6, 2025
6ba373a
Merge branch 'JD_integration_tests' of github.com:cisagov/XFD into JD…
JCantu248 Feb 6, 2025
45b81c9
Merge branch 'develop' into JD_integration_tests
JCantu248 Feb 26, 2025
6012cd3
Merge branch 'develop' of github.com:cisagov/XFD into JD_integration_…
JCantu248 Mar 11, 2025
abb21c2
Merge branch 'develop' of github.com:cisagov/XFD into develop
JCantu248 Mar 19, 2025
8e8f3eb
Merge branch 'develop' of github.com:cisagov/XFD into develop
JCantu248 Mar 21, 2025
e281b39
Turn xfd container hostname into an environment variable.
JCantu248 Mar 22, 2025
bacae41
Remove integration tests and workflows that accidentally made it into…
JCantu248 Mar 22, 2025
cc177e2
Fix whitespace in dev.env.example
JCantu248 Mar 28, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions dev.env.example
Original file line number Diff line number Diff line change
Expand Up @@ -133,10 +133,10 @@ IS_DMZ=1
POSTGRES_SCAN_USER=
POSTGRES_SCAN_PASSWORD=

PW_XFD_URL = 'http://xfd-frontend-1:3000/'
PW_XFD_USERNAME = '[email protected]'
PW_XFD_PASSWORD =
PW_XFD_2FA_ISSUER =
PW_XFD_2FA_SECRET =
PW_XFD_USER_ROLE =
SESSION_STORAGE = ""
PW_XFD_URL='http://xfd-frontend-1:3000/'
PW_XFD_USERNAME='[email protected]'
PW_XFD_PASSWORD=
PW_XFD_2FA_ISSUER=
PW_XFD_2FA_SECRET=
PW_XFD_USER_ROLE=
SESSION_STORAGE= ""
5 changes: 3 additions & 2 deletions playwright/global-setup.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ let totp = new OTPAuth.TOTP({
const axios = require('axios');

const waitForFrontend = async (url, timeout = 900000, checkInterval = 5000) => {
console.log(`Url: ${url}`);
const startTime = Date.now();
while (Date.now() - startTime < timeout) {
try {
Expand Down Expand Up @@ -48,8 +49,8 @@ async function globalSetup(config: FullConfig) {
const page = await browser.newPage();

//Log in with credentials.
await waitForFrontend('http://xfd-frontend-1:3000');
await page.goto('http://xfd-frontend-1:3000');
await waitForFrontend(process.env.PW_XFD_URL);
await page.goto(String(process.env.PW_XFD_URL));
await page.getByTestId('button').click();
await page
.getByLabel('Username (Email)')
Expand Down
7 changes: 4 additions & 3 deletions playwright/playwright.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,14 @@ export default defineConfig({
/* Reporter to use. See https://playwright.dev/docs/test-reporters */
reporter: [
['list', { printSteps: true }],
['json', { outputFile: 'test-results/test-results.json' }],
['html', { open: 'always' }]
['json', { outputFile: 'playwright-report/results.json' }],
['html', { outputFolder: 'playwright-report/html', open: 'never' }]
],
/* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
use: {
/* Base URL to use in actions like `await page.goto('/')`. */
baseURL: 'http://xfd-frontend-1:3000',
baseURL: process.env.PW_XFD_URL,
headless: true,
storageState: 'storageState.json',

/* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
Expand Down