mirror of
https://github.com/GSA/notifications-admin.git
synced 2025-12-09 22:53:27 -05:00
move file around
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
<p>{{ session['timezone'] }} </p>
|
||||
|
||||
|
||||
{% extends "withnav_template.html" %}
|
||||
|
||||
@@ -141,3 +141,4 @@
|
||||
</div>
|
||||
|
||||
{% endblock %}
|
||||
<script type="text/javascript" src="{{ asset_url('js/setTimezone.js') }}"></script>
|
||||
|
||||
10
gulpfile.js
10
gulpfile.js
@@ -61,7 +61,6 @@ const javascripts = () => {
|
||||
paths.src + 'javascripts/fileUpload.js',
|
||||
paths.src + 'javascripts/radioSelect.js',
|
||||
paths.src + 'javascripts/updateContent.js',
|
||||
paths.src + 'javascripts/setTimezone.js',
|
||||
paths.src + 'javascripts/listEntry.js',
|
||||
paths.src + 'javascripts/liveSearch.js',
|
||||
paths.src + 'javascripts/errorTracking.js',
|
||||
@@ -98,6 +97,13 @@ const copyGtmHead = () => {
|
||||
.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
|
||||
const copyImages = () => {
|
||||
return src(paths.src + 'images/**/*', { encoding: false })
|
||||
@@ -123,4 +129,4 @@ const copyAssets = async () => {
|
||||
await uswds.copyAssets();
|
||||
};
|
||||
|
||||
exports.default = series(styles, javascripts, copyGtmHead, copyImages, copyAssets);
|
||||
exports.default = series(styles, javascripts, copyGtmHead, copySetTimezone, copyImages, copyAssets);
|
||||
|
||||
@@ -1757,11 +1757,13 @@ def test_org_breadcrumbs_show_if_user_is_platform_admin(
|
||||
platform_admin_user,
|
||||
client_request,
|
||||
):
|
||||
print("ENTER TESET")
|
||||
service_one_json = service_json(
|
||||
SERVICE_ONE_ID,
|
||||
users=[platform_admin_user["id"]],
|
||||
organization_id=ORGANISATION_ID,
|
||||
)
|
||||
print("GOT SERVICE ONE")
|
||||
|
||||
mocker.patch(
|
||||
"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",
|
||||
return_value=mock_daily_stats_by_user,
|
||||
)
|
||||
print("DID ALL PATCHES")
|
||||
|
||||
client_request.login(platform_admin_user, service_one_json)
|
||||
print("LOGGED IN")
|
||||
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(
|
||||
"main.organization_dashboard",
|
||||
org_id=ORGANISATION_ID,
|
||||
|
||||
Reference in New Issue
Block a user