From 9ce965a29fe12a2ebd9bf73289d829339bfa5f6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Tron=C3=AD=C4=8Dek?= Date: Tue, 11 Feb 2025 10:14:30 +0100 Subject: [PATCH 1/2] Fix selectors for new GitHub issue design --- src/button/button-contributions.ts | 16 +++++++++++++--- src/button/button.css | 4 ++++ 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/src/button/button-contributions.ts b/src/button/button-contributions.ts index d163773..fdc5429 100644 --- a/src/button/button-contributions.ts +++ b/src/button/button-contributions.ts @@ -92,7 +92,7 @@ export interface ButtonContributionParams { /** * Additional class names that should be added to the elements. */ - additionalClassNames?: ("secondary" | "medium" | "left-align-menu")[]; + additionalClassNames?: ("secondary" | "medium" | "left-align-menu" | "tall")[]; /** * A selector that is used to insert the button before a specific element. @@ -301,7 +301,7 @@ export const buttonContributions: ButtonContributionParams[] = [ }, { - id: "gh-issues", + id: "gh-issue", exampleUrls: ["https://github.com/svenefftinge/browser-extension-test/issues/1"], selector: "#partial-discussion-header > div.gh-header-show > div > div", containerElement: createElement("div", { @@ -319,7 +319,17 @@ export const buttonContributions: ButtonContributionParams[] = [ ], }, { - id: "gh-pulls", + id: "gh-issue-new", // this isn't referring to "new issue", but to new "issue" + exampleUrls: ["https://github.com/svenefftinge/browser-extension-test/issues/1"], + selector: `xpath://*[@id="js-repo-pjax-container"]/react-app/div/div/div/div/div[1]/div/div/div[3]/div`, + containerElement: createElement("div", {}), + insertBefore: `xpath://*[@id="js-repo-pjax-container"]/react-app/div/div/div/div/div[1]/div/div/div[3]/div/div`, + application: "github", + // we need to make the button higher: the buttons here use 2rem instead of 1.75rem + additionalClassNames: ["tall"], + }, + { + id: "gh-pull", exampleUrls: ["https://github.com/svenefftinge/browser-extension-test/pull/2"], selector: "#partial-discussion-header > div.gh-header-show > div > div", containerElement: createElement("div", { diff --git a/src/button/button.css b/src/button/button.css index a8bb6fc..2a1a9f5 100644 --- a/src/button/button.css +++ b/src/button/button.css @@ -209,6 +209,10 @@ --dropdown-box-shadow: var(--shadow-floating-large, var(--color-shadow-large)); } +.github.tall { + --primary-height: var(--control-medium-size, 2rem); +} + .github .chevron-icon { padding: 3px; } From ab737cceeb201c412f95c9d6f908aefe9569ae32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Tron=C3=AD=C4=8Dek?= Date: Tue, 11 Feb 2025 10:33:50 +0100 Subject: [PATCH 2/2] Fix tests and use puppeteer new headless mode --- test/src/button-contributions-copy.ts | 16 +++++++++++++--- test/src/button-contributions.spec.ts | 6 ++---- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/test/src/button-contributions-copy.ts b/test/src/button-contributions-copy.ts index d163773..fdc5429 100644 --- a/test/src/button-contributions-copy.ts +++ b/test/src/button-contributions-copy.ts @@ -92,7 +92,7 @@ export interface ButtonContributionParams { /** * Additional class names that should be added to the elements. */ - additionalClassNames?: ("secondary" | "medium" | "left-align-menu")[]; + additionalClassNames?: ("secondary" | "medium" | "left-align-menu" | "tall")[]; /** * A selector that is used to insert the button before a specific element. @@ -301,7 +301,7 @@ export const buttonContributions: ButtonContributionParams[] = [ }, { - id: "gh-issues", + id: "gh-issue", exampleUrls: ["https://github.com/svenefftinge/browser-extension-test/issues/1"], selector: "#partial-discussion-header > div.gh-header-show > div > div", containerElement: createElement("div", { @@ -319,7 +319,17 @@ export const buttonContributions: ButtonContributionParams[] = [ ], }, { - id: "gh-pulls", + id: "gh-issue-new", // this isn't referring to "new issue", but to new "issue" + exampleUrls: ["https://github.com/svenefftinge/browser-extension-test/issues/1"], + selector: `xpath://*[@id="js-repo-pjax-container"]/react-app/div/div/div/div/div[1]/div/div/div[3]/div`, + containerElement: createElement("div", {}), + insertBefore: `xpath://*[@id="js-repo-pjax-container"]/react-app/div/div/div/div/div[1]/div/div/div[3]/div/div`, + application: "github", + // we need to make the button higher: the buttons here use 2rem instead of 1.75rem + additionalClassNames: ["tall"], + }, + { + id: "gh-pull", exampleUrls: ["https://github.com/svenefftinge/browser-extension-test/pull/2"], selector: "#partial-discussion-header > div.gh-header-show > div > div", containerElement: createElement("div", { diff --git a/test/src/button-contributions.spec.ts b/test/src/button-contributions.spec.ts index 280266e..a957975 100644 --- a/test/src/button-contributions.spec.ts +++ b/test/src/button-contributions.spec.ts @@ -10,8 +10,7 @@ describe("Platform match tests", function () { before(async function () { browser = await puppeteer.launch({ - headless: true, - browser: "chrome", + headless: "new", }); page = await browser.newPage(); }); @@ -66,8 +65,7 @@ describe("Query Selector Tests", function () { before(async function () { browser = await puppeteer.launch({ - headless: true, - browser: "chrome", + headless: "new", }); page = await browser.newPage(); });