darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-15 07:18:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

move file around

Browse Source
This commit is contained in:
Kenneth Kehl
2024-08-23 14:01:51 -07:00
parent 8e3cd6324f
commit 3456bb47a1
4 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
app/assets/javascripts/setTimezone.js → app/assets/js/setTimezone.js
View File

3
app/templates/views/dashboard/dashboard.html
View File

@@ -1,4 +1,4 @@
<p>{{ session['timezone'] }} </p>
{% extends "withnav_template.html" %} {% extends "withnav_template.html" %}
@@ -141,3 +141,4 @@
</div> </div>
{% endblock %} {% endblock %}
<script type="text/javascript" src="{{ asset_url('js/setTimezone.js') }}"></script>

10
gulpfile.js
View File

@@ -61,7 +61,6 @@ const javascripts = () => {
paths.src + 'javascripts/fileUpload.js', paths.src + 'javascripts/fileUpload.js',
paths.src + 'javascripts/radioSelect.js', paths.src + 'javascripts/radioSelect.js',
paths.src + 'javascripts/updateContent.js', paths.src + 'javascripts/updateContent.js',
paths.src + 'javascripts/setTimezone.js',
paths.src + 'javascripts/listEntry.js', paths.src + 'javascripts/listEntry.js',
paths.src + 'javascripts/liveSearch.js', paths.src + 'javascripts/liveSearch.js',
paths.src + 'javascripts/errorTracking.js', paths.src + 'javascripts/errorTracking.js',
@@ -98,6 +97,13 @@ const copyGtmHead = () => {
.pipe(dest(paths.dist + 'js/')); .pipe(dest(paths.dist + 'js/'));
}; };
// Task to copy `setTimezone.js`
const copySetTimezone = () => {
return src(paths.src + 'js/setTimezone.js')
.pipe(dest(paths.dist + 'js/'));
};
// Task to copy images // Task to copy images
const copyImages = () => { const copyImages = () => {
return src(paths.src + 'images/**/*', { encoding: false }) return src(paths.src + 'images/**/*', { encoding: false })
@@ -123,4 +129,4 @@ const copyAssets = async () => {
await uswds.copyAssets(); await uswds.copyAssets();
}; };
exports.default = series(styles, javascripts, copyGtmHead, copyImages, copyAssets); exports.default = series(styles, javascripts, copyGtmHead, copySetTimezone, copyImages, copyAssets);

8
tests/app/main/views/test_dashboard.py
View File

@@ -1757,11 +1757,13 @@ def test_org_breadcrumbs_show_if_user_is_platform_admin(
platform_admin_user, platform_admin_user,
client_request, client_request,
): ):
print("ENTER TESET")
service_one_json = service_json( service_one_json = service_json(
SERVICE_ONE_ID, SERVICE_ONE_ID,
users=[platform_admin_user["id"]], users=[platform_admin_user["id"]],
organization_id=ORGANISATION_ID, organization_id=ORGANISATION_ID,
) )
print("GOT SERVICE ONE")
mocker.patch( mocker.patch(
"app.service_api_client.get_service", return_value={"data": service_one_json} "app.service_api_client.get_service", return_value={"data": service_one_json}
@@ -1783,10 +1785,14 @@ def test_org_breadcrumbs_show_if_user_is_platform_admin(
"app.main.views.dashboard.get_daily_stats_by_user", "app.main.views.dashboard.get_daily_stats_by_user",
return_value=mock_daily_stats_by_user, return_value=mock_daily_stats_by_user,
) )
print("DID ALL PATCHES")
client_request.login(platform_admin_user, service_one_json) client_request.login(platform_admin_user, service_one_json)
print("LOGGED IN")
page = client_request.get("main.service_dashboard", service_id=SERVICE_ONE_ID) page = client_request.get("main.service_dashboard", service_id=SERVICE_ONE_ID)
print("HERE IS THE PAGE")
print(page)
print("XXXXXXXXXXXXXXXXX")
assert page.select_one(".navigation-organization-link")["href"] == url_for( assert page.select_one(".navigation-organization-link")["href"] == url_for(
"main.organization_dashboard", "main.organization_dashboard",
org_id=ORGANISATION_ID, org_id=ORGANISATION_ID,