Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add node fetch for test #272

Open
wants to merge 14 commits into
base: v3.x/master
Choose a base branch
from
Open

Add node fetch for test #272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
7a5a30f
Add node fetch for test
Oct 29, 2024
2d59a31
Update utils file
Oct 29, 2024
593412e
export functions
Oct 29, 2024
106dc11
update utils
Oct 29, 2024
6e54eb8
update utils
Oct 29, 2024
b2e9f58
update explorer fvt utilities
Oct 30, 2024
3b82563
update fvt
Oct 31, 2024
7e610ab
git reject tls
Nov 4, 2024
93fc1b3
remove duplicate
Nov 4, 2024
bab6e63
test
Nov 4, 2024
f005aff
test
Nov 4, 2024
e3b537e
test
Nov 4, 2024
3f0f186
test
Nov 4, 2024
1013991
move node-fetch
Nov 5, 2024
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
51 changes: 47 additions & 4 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
"devDependencies": {
"@babel/eslint-parser": "7.25.1",
"@babel/plugin-proposal-decorators": "7.24.7",
"@babel/preset-stage-0": "7.8.3",
"@babel/preset-env": "7.25.4",
"@babel/preset-react": "7.24.7",
"@babel/preset-stage-0": "7.8.3",
"@babel/register": "7.24.6",
"@types/chai": "4.3.18",
"@types/mocha": "10.0.7",
Expand All @@ -51,14 +51,15 @@
"eslint-plugin-jsx-a11y": "6.9.0",
"eslint-plugin-react": "7.35.0",
"expect": "1.20.2",
"explorer-fvt-utilities": "2.0.4",
"explorer-fvt-utilities": "3.0.1",
"file-loader": "6.2.0",
"html-webpack-plugin": "5.6.0",
"mocha": "10.7.3",
"mocha-jenkins-reporter": "0.4.8",
"nock": "13.5.5",
"npm-run-all": "4.1.5",
"nyc": "17.0.0",
"node-fetch": "^2.7.0",
"redux-mock-store": "1.5.4",
"rewire": "7.0.0 ",
"rimraf": "3.0.2",
Expand Down
197 changes: 100 additions & 97 deletions tests/FVTTests/utilities.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,92 +8,96 @@
* Copyright IBM Corporation 2020
*/

import https = require('https');
import * as https from 'https';
import fetch from 'node-fetch';

process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';


import {
SERVER_HOST,
SERVER_PORT,
b64Credentials,
TEST_PARTITIONED_DATASET,
TEST_SEQUENTIAL_DATASET,
TEST_DATASET_MEMBER} from './environment';
TEST_DATASET_MEMBER
} from './environment';
import { WebDriver, WebElement, By, until, Key } from 'selenium-webdriver';

function getHttpsAgent() :https.Agent {
return new https.Agent({
rejectUnauthorized: false,
});
}

export async function createTestPartitionedDataset() {
await deleteDataset(TEST_PARTITIONED_DATASET, true); //try to delete dataset if it didn't get cleaned up last time
async function createTestPartitionedDataset() {
await deleteDataset(TEST_PARTITIONED_DATASET, true);
await createDataset({
primary: 300,
alcunit: "TRK",
recfm: "FB",
dsorg: "PO",
name:`${TEST_PARTITIONED_DATASET}`,
dirblk: 20,
secondary: 100,
lrecl: 80
})
name: `${TEST_PARTITIONED_DATASET}`,
volser: "zmf046",
unit: "3390",
dsorg: "PO",
alcunit: "TRK",
primary: 10,
secondary: 5,
dirblk: 10,
avgblk: 500,
recfm: "FB",
blksize: 400,
lrecl: 80
});
}


export async function createTestSequentialDataset() {
await deleteDataset(TEST_SEQUENTIAL_DATASET, true) //try to delete dataset if it didn't get cleaned up last time
async function createTestSequentialDataset() {
await deleteDataset(TEST_SEQUENTIAL_DATASET, true);
await createDataset({
primary:300,
alcunit: "TRK",
recfm:"FB",
dsorg:"PS",
name:`${TEST_SEQUENTIAL_DATASET}`,
secondary:100,
lrecl:80
})
volser: "zmf046",
name: `${TEST_SEQUENTIAL_DATASET}`,
unit: "3390",
dsorg: "PS",
alcunit: "TRK",
primary: 10,
secondary: 5,
avgblk: 500,
recfm: "FB",
blksize: 400,
lrecl: 80
});
}

interface DatasetCreationParams {
primary :number,
alcunit :string,
recfm :string,
dsorg :string,
name? :string,
dirblk? :number,
secondary :number,
lrecl :number,
primary: number;
alcunit: string;
recfm: string;
dsorg: string;
secondary: number;
lrecl: number;
volser: string;
unit: string;
avgblk: number;
blksize: number;
dirblk?: number;
name?: string;
}

async function createDataset(requestBody :DatasetCreationParams) {
const agent :https.Agent = getHttpsAgent();
await fetch(`https://${SERVER_HOST}:${SERVER_PORT}/ibmzosmf/api/v1/zosmf/restfiles/ds/${requestBody.name}`, {
async function createDataset(requestBody: DatasetCreationParams) {
const response = await fetch(`https://${SERVER_HOST}:${SERVER_PORT}/ibmzosmf/api/v1/zosmf/restfiles/ds/${requestBody.name}`, {
method: 'POST',
headers: {
authorization: b64Credentials,
'Content-Type': 'application/json',
'X-CSRF-ZOSMF-HEADER': '*',
},
agent,
body: JSON.stringify(requestBody),
}).then(
async response => {
if (response.ok) {
console.log(`${requestBody.name}, created succesfully`);
} else {
console.log(`${requestBody.name}, create failed`);
return response.json().then(e => {
console.log(e.message);
throw Error(e.message);
});
}
},
)
});

if (response.ok) {
console.log(`${requestBody.name}, created successfully`);
} else {
console.log(`${requestBody.name}, create failed`);
const error = await response.json();
console.log(error.message);
throw new Error(error.message);
}
}

export async function createTestDatasetMember() {
const agent :https.Agent = getHttpsAgent();
async function createTestDatasetMember() {
const fullDatasetAndMemberName = `${TEST_PARTITIONED_DATASET}(${TEST_DATASET_MEMBER})`;
await fetch(`https://${SERVER_HOST}:${SERVER_PORT}/ibmzosmf/api/v1/zosmf/restfiles/ds/${fullDatasetAndMemberName}`, {
const response = await fetch(`https://${SERVER_HOST}:${SERVER_PORT}/ibmzosmf/api/v1/zosmf/restfiles/ds/${fullDatasetAndMemberName}`, {
method: 'PUT',
headers: {
authorization: b64Credentials,
Expand All @@ -102,55 +106,44 @@ export async function createTestDatasetMember() {
'X-CSRF-ZOSMF-HEADER': '*',
},
body: '',
agent,
}).then (
async response => {
if(response.ok) {
console.log(`${fullDatasetAndMemberName}, created succesfully`);
} else {
console.log(`${fullDatasetAndMemberName}, create failed`);
return response.json().then(e => {
console.log(e.message);
throw Error(e.message);
});
}
}
)
}
});

if (response.ok) {
console.log(`${fullDatasetAndMemberName}, created successfully`);
} else {
console.log(`${fullDatasetAndMemberName}, create failed`);
const error = await response.json();
console.log(error.message);
throw new Error(error.message);
}
}

export async function cleanupDatasets(failOk = false){
async function cleanupDatasets(failOk = false) {
await deleteDataset(TEST_PARTITIONED_DATASET, true);
await deleteDataset(TEST_SEQUENTIAL_DATASET, true);
}

/**
*
* @param failOk If you're unsure if the dataset exists set this to true to avoid failing a test
*/
export async function deleteDataset(dataset :string, failOk = false) {
const agent :https.Agent = getHttpsAgent();
await fetch(`https://${SERVER_HOST}:${SERVER_PORT}/ibmzosmf/api/v1/zosmf/restfiles/ds/${dataset}`, {
async function deleteDataset(dataset: string, failOk = false) {
const response = await fetch(`https://${SERVER_HOST}:${SERVER_PORT}/ibmzosmf/api/v1/zosmf/restfiles/ds/${dataset}`, {
method: 'DELETE',
headers: { authorization: b64Credentials, 'X-CSRF-ZOSMF-HEADER': '*' },
agent
}).then(
async response => {
if (response.ok) {
console.log(`${dataset}, deleted succesfully`);
} else {
console.log(`${dataset}, delete failed`);
console.log(`${response.status} : ${response.statusText}`);
//failOk can be set when you're not sure if the dataset exists that you're trying to delete
if(!failOk) {
throw Error(`Delete dataset failed - ${response.status} : ${response.statusText}`);
}
}
headers: {
authorization: b64Credentials,
'X-CSRF-ZOSMF-HEADER': '*'
},
);
});

if (response.ok) {
console.log(`${dataset}, deleted successfully`);
} else {
console.log(`${dataset}, delete failed`);
console.log(`${response.status} : ${response.statusText}`);
if (!failOk) {
throw new Error(`Delete dataset failed - ${response.status} : ${response.statusText}`);
}
}
}

export async function editDatasetQualifierField(driver :WebDriver, searchQualifier :string) {
async function editDatasetQualifierField(driver: WebDriver, searchQualifier: string) {
const qualifierField: WebElement = await driver.findElement(By.id("datasets-qualifier-field"));
await qualifierField.clear();
await qualifierField.sendKeys(searchQualifier);
Expand All @@ -159,3 +152,13 @@ export async function editDatasetQualifierField(driver :WebDriver, searchQualifi
await driver.sleep(500);
await driver.wait(until.elementLocated(By.id('refresh-icon')), 20000);
}


export {
createTestPartitionedDataset,
createTestSequentialDataset,
createTestDatasetMember,
cleanupDatasets,
deleteDataset,
editDatasetQualifierField
};
Loading