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

Jump to bottom

Issue #969: Jobs with a hash in the name can't be opened #1253

Merged
merged 7 commits into from
Apr 21, 2021
Merged

Issue #969: Jobs with a hash in the name can't be opened #1253

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
48cce8e
Adding fix for job names with a hash in them
katelynienaber Mar 30, 2021
95fc32b
update y18n in yarn.lock
zFernand0 Apr 8, 2021
1947c23
Merge branch 'master' into fix-job-name-with-hash
katelynienaber Apr 9, 2021
0cce57a
Merge branch 'master' into fix-job-name-with-hash
katelynienaber Apr 13, 2021
0de9bcc
Merge branch 'master' into fix-job-name-with-hash
jellypuno Apr 20, 2021
4ebbb93
Removing weird committed files
chladnefazole Apr 20, 2021
25d21a5
Merge branch 'master' into fix-job-name-with-hash
jellypuno Apr 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 0 additions & 2 deletions .github/workflows/zowe-explorer-ftp-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,12 @@ jobs:
env:
CI: true
NODE_OPTIONS: --max_old_space_size=4096

# - name: Upload test results
katelynienaber marked this conversation as resolved.
Show resolved Hide resolved
# uses: actions/upload-artifact@v1
# # if: matrix.os == 'windows-latest' && matrix.node-version == '12.x'
# with:
# name: zowe-explorer-ftp-extension-results
# path: packages/zowe-explorer-ftp-extension/results/

# Run codecov upload for only one run
# - name: Upload Results to Codecov from Windows / Node 12.x
# if: matrix.os == 'windows-latest' && matrix.node-version == '12.x'
Expand Down
5 changes: 1 addition & 4 deletions packages/zowe-explorer/__tests__/__theia__/extension.theia.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,12 @@ import * as driverChrome from "./theia/extension.theiaChrome";

const TIMEOUT = 45000;
const SLEEPTIME = 10000;
const SHORTSLEEPTIME = 2000;
const SHORTSLEEPTIME = 2000;
declare var it: any;
const expect = chai.expect;
chai.use(chaiAsPromised);

describe("Add Default Profile", () => {

before(async () => {
await driverFirefox.openBrowser();
await driverFirefox.sleepTime(SHORTSLEEPTIME);
Expand Down Expand Up @@ -79,7 +78,6 @@ describe("Add Default Profile", () => {
});

describe("Add Profiles", () => {

before(async () => {
await driverFirefox.openBrowser();
await driverFirefox.sleepTime(SHORTSLEEPTIME);
Expand Down Expand Up @@ -205,7 +203,6 @@ describe("Remove Profile from Favorites", () => {
expect(favoriteProfile).to.equal(true);
});


after(async () => driverChrome.closeBrowser());
});

Expand Down
11 changes: 5 additions & 6 deletions packages/zowe-explorer/__tests__/__theia__/theia/Locators.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,10 @@
*/

export const TheiaLocator = {

theiaUrl: "http://localhost:3000",

zoweExplorerxId: "shell-tab-plugin-view-container:zowe",
};
};

export const DatasetsLocators = {
datasetTabId: "plugin-view-container:zowe--plugin-view:zowe.explorer",
Expand All @@ -31,7 +30,7 @@ export const DatasetsLocators = {
removeFavoriteProfileFromDatasetsOptionXpath: "//li[@data-command='__plugin.menu.action.zowe.removeFavProfile']",
secondDatasetProfileBeforeDeletingId: "/1:TestSeleniumProfile",
deleteProfileFromDatasetsXpath: "(//li[@data-command='__plugin.menu.action.zowe.deleteProfile'])",
};
};

export const UssLocators = {
ussTabId: "plugin-view-container:zowe--plugin-view:zowe.uss.explorer",
Expand All @@ -48,7 +47,7 @@ export const UssLocators = {
removeFavoriteProfileFromUssOptionXpath: "//li[@data-command='__plugin.menu.action.zowe.uss.removeFavProfile']",
hideProfileFromUssOptionXpath: "//li[@data-command='__plugin.menu.action.zowe.uss.removeSession']",
searchSymbolInFavoriteXpath: "//*[@id='/0:Favorites/0:TestSeleniumProfile/0:']",
};
};

export const JobsLocators = {
jobTabId: "plugin-view-container:zowe--plugin-view:zowe.jobs",
Expand All @@ -68,9 +67,9 @@ export const JobsLocators = {
hideProfileFromJobsOptionXpath: "//li[@data-command='__plugin.menu.action.zowe.removeJobsSession']",
secondJobsProfileIdBeforeHidingXpath: "(//div[@id='/2:TestSeleniumProfile'])[2]",
favoriteprofilexpath: "//div[@id='/0:Favorites/0:TestSeleniumProfile']",
};
};

export const TheiaNotificationMessages = {
closeTheiaNotificationWarningMsgXpath: "/html/body/div[3]/div/div[1]/div/div/div/div/ul/li",
deleteProfileNotificationMsg: "/html/body/div[3]/div/div[1]/div/div/div/div/div[2]/span",
};
};