Skip to content

Issue 1135: Update locators for Sign In that changed from link to button #7682

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

Open
labkey-susanh wants to merge 14 commits into
base: develop
Choose a base branch
from
Open

Issue 1135: Update locators for Sign In that changed from link to button #7682

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
153dfd2
Update login.html for improved accessibility and fix test locators
labkey-susanh May 19, 2026
d9cf3ba
@labkey/components v7.37.1-moreAccessibility.0 and @labkey/premium v7…
labkey-susanh May 19, 2026
783d5cc
Locator updates for label changes
labkey-susanh May 20, 2026
2c505d1
Merge remote-tracking branch 'origin/develop' into fb_moreAccessibility
labkey-susanh May 20, 2026
68615d9
Merge remote-tracking branch 'origin/develop' into fb_moreAccessibility
labkey-susanh May 21, 2026
3332362
Package updates
labkey-susanh May 21, 2026
57f9da6
update packages after merge from develop
labkey-susanh May 21, 2026
f6deeb8
Merge remote-tracking branch 'origin/develop' into fb_moreAccessibility
labkey-susanh May 21, 2026
8e463ec
package updates
labkey-susanh May 22, 2026
189a4ea
Add type="button" for sign in and register buttons
labkey-susanh May 22, 2026
6f30852
Register is actually meant to be a link
labkey-susanh May 22, 2026
7a051dd
package updates
labkey-susanh May 22, 2026
6bb06c8
@labkey/components v7.38.1-moreAccessibility.8 and @labkey/premium v7…
labkey-susanh May 22, 2026
71ef96d
Merge remote-tracking branch 'origin/develop' into fb_moreAccessibility
labkey-susanh May 22, 2026
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
8 changes: 4 additions & 4 deletions assay/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.

2 changes: 1 addition & 1 deletion assay/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
}
},
"dependencies": {
"@labkey/components": "7.38.0"
"@labkey/components": "7.38.1-moreAccessibility.8"
},
"devDependencies": {
"@labkey/build": "9.1.3",
Expand Down
8 changes: 4 additions & 4 deletions core/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.

2 changes: 1 addition & 1 deletion core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
}
},
"dependencies": {
"@labkey/components": "7.38.0",
"@labkey/components": "7.38.1-moreAccessibility.8",
"@labkey/themes": "1.9.3"
},
"devDependencies": {
Expand Down
13 changes: 7 additions & 6 deletions core/resources/views/login.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,27 @@
<div class="labkey-error" id="errors"></div>
<div class="auth-form-body">
<label for="email">Email</label>
<input id="email" name="email" type="text" class="input-block" tabindex="1" autocomplete="off">
<input id="email" name="email" type="text" class="input-block" autocomplete="off">
<label for="password">Password</label>
<div class="forgot-password-link">
<a href="login-resetPassword.view">Forgot password</a>
</div>
<input id="password" name="password" type="password" class="input-block" tabindex="2" autocomplete="off">
<input tabindex="3" type="checkbox" name="remember" id="remember" checked> Remember my email address
<input id="password" name="password" type="password" class="input-block" autocomplete="off">
<input aria-labelledby="remember-label" type="checkbox" name="remember" id="remember" checked >
<span id="remember-label">Remember my email address</span>
<div class="termsOfUseSection" hidden>
<div class="auth-header auth-item">Terms of Use</div>
<div class="toucontent auth-item termsOfUseContent"></div>
<div class="auth-item">
<input type="checkbox" tabindex="4" name="approvedTermsOfUse" id="approvedTermsOfUse" class="auth-item">
<input type="checkbox" name="approvedTermsOfUse" id="approvedTermsOfUse" class="auth-item">
<label for="approvedTermsOfUse">I agree to these terms</label>
</div>
</div>
<input type="hidden" name="termsOfUseType" id="termsOfUseType">
<div class="auth-item auth-credentials-submit">
<!-- Note: login.js attaches an authenticateUser() click event to elements with classes "loginSubmitButton" and "signin-btn" -->
<input type="submit" tabindex="-1" class="loginSubmitButton"/>
<a tabindex="5" class="labkey-button primary signin-btn"><span>Sign In</span></a>
<button class="labkey-button primary signin-btn" type="button"><span>Sign In</span></button>
<span class="registrationSection" hidden>
<a class="labkey-button" id="registerButton" href="login-register.view">Register</a>
</span>
Expand All @@ -47,4 +48,4 @@
document.getElementById('registerButton').href += '?returnUrl=' + encodeURIComponent(LABKEY.ActionURL.getParameter('returnUrl'));
}
});
</script>
</script>
4 changes: 2 additions & 2 deletions devtools/test/src/org/labkey/test/tests/devtools/AuthenticationProviderReorderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public void testReorderConfigurations()

signOut();
assertSsoLinkOrder(config_uncool, config_cool);
clickAndWait(Locator.linkWithText("Sign In"));
clickAndWait(Locator.button("Sign In"));
assertSsoLinkOrder(config_uncool, config_cool);
simpleSignIn();

Expand All @@ -64,7 +64,7 @@ public void testReorderConfigurations()

signOut();
assertSsoLinkOrder(config_cool, config_uncool);
clickAndWait(Locator.linkWithText("Sign In"));
clickAndWait(Locator.button("Sign In"));
assertSsoLinkOrder(config_cool, config_uncool);
simpleSignIn();
}
Expand Down
8 changes: 4 additions & 4 deletions experiment/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.

2 changes: 1 addition & 1 deletion experiment/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"test-integration": "cross-env NODE_ENV=test jest --ci --runInBand -c test/js/jest.config.integration.js"
},
"dependencies": {
"@labkey/components": "7.38.0"
"@labkey/components": "7.38.1-moreAccessibility.8"
},
"devDependencies": {
"@labkey/build": "9.1.3",
Expand Down
8 changes: 4 additions & 4 deletions pipeline/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.

2 changes: 1 addition & 1 deletion pipeline/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"build-prod": "npm run clean && cross-env NODE_ENV=production PROD_SOURCE_MAP=source-map webpack --config node_modules/@labkey/build/webpack/prod.config.js --color --progress --profile"
},
"dependencies": {
"@labkey/components": "7.38.0"
"@labkey/components": "7.38.1-moreAccessibility.8"
},
"devDependencies": {
"@labkey/build": "9.1.3",
Expand Down