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

[java] Fix FedCM command definition #14070

Merged
merged 19 commits into from
Dec 26, 2024
Merged

[java] Fix FedCM command definition #14070

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
3ce6c63
Fix FedCM command definition
cbiesinger Jun 3, 2024
e7a13d3
Merge remote-tracking branch 'origin' into fedcm
cbiesinger Jun 25, 2024
956f925
Unskip FedCM tests
cbiesinger Jun 25, 2024
98d9693
Merge branch 'trunk' into fedcm
pujagani Dec 17, 2024
d58c901
[java] Update and fix test
pujagani Dec 19, 2024
fa299e3
Merge branch 'trunk' into fedcm
pujagani Dec 19, 2024
fe6805a
Merge branch 'trunk' into fedcm
pujagani Dec 20, 2024
ff69f85
Fix assertion
pujagani Dec 20, 2024
d57f3fa
Merge branch 'fedcm' of https://github.com/cbiesinger/selenium into p…
pujagani Dec 20, 2024
a7f5bf6
Remove unnecessary handler
pujagani Dec 23, 2024
06dcf39
[java] Remove unnecessary options
pujagani Dec 23, 2024
58a0f01
Remove unrelated file changes
pujagani Dec 23, 2024
dce6168
Ignore all tests in python
pujagani Dec 23, 2024
4aa83e1
Ignore ruby tests
pujagani Dec 23, 2024
98e5384
[java] Add assertion for subtitle
pujagani Dec 23, 2024
8a970dc
Ensure tests pass in other languages
pujagani Dec 23, 2024
e02f75b
[java] Trying to check the javascript error
pujagani Dec 23, 2024
6955aa9
Adding handler to see if tests pass on CI
pujagani Dec 24, 2024
bb96962
Try first iteration of changes to work on CI
pujagani Dec 24, 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
17 changes: 9 additions & 8 deletions java/src/org/openqa/selenium/remote/codec/AbstractHttpCommandCodec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,14 +197,15 @@ public AbstractHttpCommandCodec() {
defineCommand(SET_USER_VERIFIED, post(webauthnId + "/uv"));

// Federated Credential Management API
defineCommand(CANCEL_DIALOG, post("/fedcm/canceldialog"));
defineCommand(SELECT_ACCOUNT, post("/fedcm/selectaccount"));
defineCommand(CLICK_DIALOG, post("/fedcm/clickdialogbutton"));
defineCommand(GET_ACCOUNTS, get("/fedcm/accountlist"));
defineCommand(GET_FEDCM_TITLE, get("/fedcm/gettitle"));
defineCommand(GET_FEDCM_DIALOG_TYPE, get("/fedcm/getdialogtype"));
defineCommand(SET_DELAY_ENABLED, post("/fedcm/setdelayenabled"));
defineCommand(RESET_COOLDOWN, post("/fedcm/resetcooldown"));
String fedcm = sessionId + "/fedcm";
defineCommand(CANCEL_DIALOG, post(fedcm + "/canceldialog"));
defineCommand(SELECT_ACCOUNT, post(fedcm + "/selectaccount"));
defineCommand(CLICK_DIALOG, post(fedcm + "/clickdialogbutton"));
defineCommand(GET_ACCOUNTS, get(fedcm + "/accountlist"));
defineCommand(GET_FEDCM_TITLE, get(fedcm + "/gettitle"));
defineCommand(GET_FEDCM_DIALOG_TYPE, get(fedcm + "/getdialogtype"));
defineCommand(SET_DELAY_ENABLED, post(fedcm + "/setdelayenabled"));
defineCommand(RESET_COOLDOWN, post(fedcm + "/resetcooldown"));

defineCommand(GET_DOWNLOADABLE_FILES, get(sessionId + "/se/files"));
defineCommand(DOWNLOAD_FILE, post(sessionId + "/se/files"));
Expand Down
7 changes: 0 additions & 7 deletions .../org/openqa/selenium/federatedcredentialmanagement/FederatedCredentialManagementTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
import org.openqa.selenium.chrome.ChromeOptions;
import org.openqa.selenium.support.ui.WebDriverWait;
import org.openqa.selenium.testing.JupiterTestBase;
import org.openqa.selenium.testing.NotYetImplemented;

class FederatedCredentialManagementTest extends JupiterTestBase {

Expand Down Expand Up @@ -81,9 +80,6 @@ private int getSecurePort() {
}

@Test
@NotYetImplemented(
value = CHROME,
reason = "https://github.com/SeleniumHQ/selenium/pull/12096#issuecomment-2017760822")
void testDismissDialog() {
fedcmDriver.setDelayEnabled(false);
assertNull(fedcmDriver.getFederatedCredentialManagementDialog());
Expand Down Expand Up @@ -116,9 +112,6 @@ void testDismissDialog() {
}

@Test
@NotYetImplemented(
value = CHROME,
reason = "https://github.com/SeleniumHQ/selenium/pull/12096#issuecomment-2017760822")
void testSelectAccount() {
fedcmDriver.setDelayEnabled(false);
assertNull(fedcmDriver.getFederatedCredentialManagementDialog());
Expand Down
Loading