Activity snapshot
diff --git a/docs/debug-issues-with-staging-api.md b/docs/debug-issues-with-staging-api.md
new file mode 100644
index 000000000..517eab4d9
--- /dev/null
+++ b/docs/debug-issues-with-staging-api.md
@@ -0,0 +1,26 @@
+### Setting Up Environment Variables for Local Development to the Staging API
+
+When you’re working locally, you can point your local admin repo to the staging API and use that to help debug
+issues with the staging data set. To do this, you’ll need to modify your .env file for the admin project and
+include the following new environment variables:
+
+- `ADMIN_CLIENT_SECRET`
+- `ADMIN_CLIENT_USERNAME`
+- `DANGEROUS_SALT`
+- `SECRET_KEY`
+
+Additionally, update `API_HOST_NAME` and `NOTIFY_ENVIRONMENT`:
+
+1. Change `API_HOST_NAME` to `API_HOST_NAME=https://notify-api-staging.app.cloud.gov`
+2. Change `NOTIFY_ENVIRONMENT` to `NOTIFY_ENVIRONMENT=staging`
+
+### Retrieving Environment Variables for Staging
+
+You can retrieve the values needed for these by using the `cf` CLI (Cloud Foundry CLI tool) and making sure
+you’re targeting the `notify-staging` space.
+
+1. `cf login -a [api.fr.cloud.gov](http://api.fr.cloud.gov/) --sso`
+2. select `notify-staging`
+3. `cf env notify-admin-staging`
+
+By pointing your local environment to staging, it should mirror what's in staging.
diff --git a/poetry.lock b/poetry.lock
index 865e6da97..88cec6cce 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -201,13 +201,13 @@ crt = ["botocore[crt] (>=1.21.0,<2.0a0)"]
[[package]]
name = "botocore"
-version = "1.34.150"
+version = "1.34.156"
description = "Low-level, data-driven core of boto 3."
optional = false
python-versions = ">=3.8"
files = [
- {file = "botocore-1.34.150-py3-none-any.whl", hash = "sha256:b988d47f4d502df85befce11a48002421e4e6ea4289997b5e0261bac5fa76ce6"},
- {file = "botocore-1.34.150.tar.gz", hash = "sha256:4d23387e0f076d87b637a2a35c0ff2b8daca16eace36b63ce27f65630c6b375a"},
+ {file = "botocore-1.34.156-py3-none-any.whl", hash = "sha256:c48f8c8996216dfdeeb0aa6d3c0f2c7ae25234766434a2ea3e57bdc08494bdda"},
+ {file = "botocore-1.34.156.tar.gz", hash = "sha256:5d1478c41ab9681e660b3322432fe09c4055759c317984b7b8d3af9557ff769a"},
]
[package.dependencies]
@@ -216,7 +216,7 @@ python-dateutil = ">=2.1,<3.0.0"
urllib3 = {version = ">=1.25.4,<2.2.0 || >2.2.0,<3", markers = "python_version >= \"3.10\""}
[package.extras]
-crt = ["awscrt (==0.20.11)"]
+crt = ["awscrt (==0.21.2)"]
[[package]]
name = "cachecontrol"
@@ -1325,13 +1325,9 @@ files = [
{file = "lxml-5.2.2-cp36-cp36m-win_amd64.whl", hash = "sha256:edcfa83e03370032a489430215c1e7783128808fd3e2e0a3225deee278585196"},
{file = "lxml-5.2.2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:28bf95177400066596cdbcfc933312493799382879da504633d16cf60bba735b"},
{file = "lxml-5.2.2-cp37-cp37m-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3a745cc98d504d5bd2c19b10c79c61c7c3df9222629f1b6210c0368177589fb8"},
- {file = "lxml-5.2.2-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1b590b39ef90c6b22ec0be925b211298e810b4856909c8ca60d27ffbca6c12e6"},
{file = "lxml-5.2.2-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b336b0416828022bfd5a2e3083e7f5ba54b96242159f83c7e3eebaec752f1716"},
- {file = "lxml-5.2.2-cp37-cp37m-manylinux_2_28_aarch64.whl", hash = "sha256:c2faf60c583af0d135e853c86ac2735ce178f0e338a3c7f9ae8f622fd2eb788c"},
{file = "lxml-5.2.2-cp37-cp37m-manylinux_2_28_x86_64.whl", hash = "sha256:4bc6cb140a7a0ad1f7bc37e018d0ed690b7b6520ade518285dc3171f7a117905"},
- {file = "lxml-5.2.2-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:7ff762670cada8e05b32bf1e4dc50b140790909caa8303cfddc4d702b71ea184"},
{file = "lxml-5.2.2-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:57f0a0bbc9868e10ebe874e9f129d2917750adf008fe7b9c1598c0fbbfdde6a6"},
- {file = "lxml-5.2.2-cp37-cp37m-musllinux_1_2_aarch64.whl", hash = "sha256:a6d2092797b388342c1bc932077ad232f914351932353e2e8706851c870bca1f"},
{file = "lxml-5.2.2-cp37-cp37m-musllinux_1_2_x86_64.whl", hash = "sha256:60499fe961b21264e17a471ec296dcbf4365fbea611bf9e303ab69db7159ce61"},
{file = "lxml-5.2.2-cp37-cp37m-win32.whl", hash = "sha256:d9b342c76003c6b9336a80efcc766748a333573abf9350f4094ee46b006ec18f"},
{file = "lxml-5.2.2-cp37-cp37m-win_amd64.whl", hash = "sha256:b16db2770517b8799c79aa80f4053cd6f8b716f21f8aca962725a9565ce3ee40"},
@@ -1666,6 +1662,7 @@ files = [
{file = "msgpack-1.0.8-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:5fbb160554e319f7b22ecf530a80a3ff496d38e8e07ae763b9e82fadfe96f273"},
{file = "msgpack-1.0.8-cp39-cp39-win32.whl", hash = "sha256:f9af38a89b6a5c04b7d18c492c8ccf2aee7048aff1ce8437c4683bb5a1df893d"},
{file = "msgpack-1.0.8-cp39-cp39-win_amd64.whl", hash = "sha256:ed59dd52075f8fc91da6053b12e8c89e37aa043f8986efd89e61fae69dc1b011"},
+ {file = "msgpack-1.0.8-py3-none-any.whl", hash = "sha256:24f727df1e20b9876fa6e95f840a2a2651e34c0ad147676356f4bf5fbb0206ca"},
{file = "msgpack-1.0.8.tar.gz", hash = "sha256:95c02b0e27e706e48d0e5426d1710ca78e0f0628d6e89d5b5a5b91a5f12274f3"},
]
@@ -2512,7 +2509,6 @@ files = [
{file = "PyYAML-6.0.1-cp311-cp311-win_amd64.whl", hash = "sha256:bf07ee2fef7014951eeb99f56f39c9bb4af143d8aa3c21b1677805985307da34"},
{file = "PyYAML-6.0.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:855fb52b0dc35af121542a76b9a84f8d1cd886ea97c84703eaa6d88e37a2ad28"},
{file = "PyYAML-6.0.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:40df9b996c2b73138957fe23a16a4f0ba614f4c0efce1e9406a184b6d07fa3a9"},
- {file = "PyYAML-6.0.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a08c6f0fe150303c1c6b71ebcd7213c2858041a7e01975da3a99aed1e7a378ef"},
{file = "PyYAML-6.0.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6c22bec3fbe2524cde73d7ada88f6566758a8f7227bfbf93a408a9d86bcc12a0"},
{file = "PyYAML-6.0.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:8d4e9c88387b0f5c7d5f281e55304de64cf7f9c0021a3525bd3b1c542da3b0e4"},
{file = "PyYAML-6.0.1-cp312-cp312-win32.whl", hash = "sha256:d483d2cdf104e7c9fa60c544d92981f12ad66a457afae824d146093b8c294c54"},
@@ -3092,4 +3088,4 @@ files = [
[metadata]
lock-version = "2.0"
python-versions = "^3.12.2"
-content-hash = "b271104f669ce0a8e78fb09299b61cf0502cc81a18213dda00f77c759b6e0209"
+content-hash = "9d6309a76755b2639d787f99944c1ead0bd93ab9f2f13208f88c51cecb5e0081"
diff --git a/pyproject.toml b/pyproject.toml
index 5a9dc8727..915f23610 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -39,7 +39,7 @@ markdown = "^3.5.2"
async-timeout = "^4.0.3"
bleach = "^6.1.0"
boto3 = "^1.34.150"
-botocore = "^1.34.150"
+botocore = "^1.34.156"
cachetools = "^5.4.0"
cffi = "^1.16.0"
cryptography = "^43.0.0"
diff --git a/tests/app/notify_client/test_notify_admin_api_client.py b/tests/app/notify_client/test_notify_admin_api_client.py
index e68d4669f..d15eebfc3 100644
--- a/tests/app/notify_client/test_notify_admin_api_client.py
+++ b/tests/app/notify_client/test_notify_admin_api_client.py
@@ -41,6 +41,26 @@ def test_active_service_can_be_modified(notify_admin, method, user, service):
assert ret == request.return_value
+@pytest.mark.parametrize(
+ ("arg", "expected_result"),
+ [
+ (
+ "('/user/c5f8a5c9-56d5-4fa9-8c30-3449ae10c072/verify/code',)",
+ True,
+ ),
+ ("('/user/get-login-gov-user',)", True),
+ (
+ "('/service/blahblahblah',)",
+ False,
+ ),
+ ],
+)
+def test_is_calling_signin_url(arg, expected_result):
+ api_client = NotifyAdminAPIClient()
+ result = api_client.is_calling_signin_url(arg)
+ assert result == expected_result
+
+
@pytest.mark.parametrize("method", ["put", "post", "delete"])
def test_inactive_service_cannot_be_modified_by_normal_user(
notify_admin, api_user_active, method
diff --git a/tests/javascripts/activityChart.test.js b/tests/javascripts/activityChart.test.js
index 4fea5748b..458cfe106 100644
--- a/tests/javascripts/activityChart.test.js
+++ b/tests/javascripts/activityChart.test.js
@@ -221,3 +221,43 @@ test('Dropdown change event triggers handleDropdownChange with logging', () => {
// Restore the console method
consoleSpy.mockRestore();
});
+
+
+test('Initial fetch data populates chart and table', done => {
+ const mockData = {
+ '2024-07-01': { sms: { delivered: 50, failed: 5 } },
+ '2024-07-02': { sms: { delivered: 60, failed: 2 } },
+ '2024-07-03': { sms: { delivered: 70, failed: 1 } },
+ '2024-07-04': { sms: { delivered: 80, failed: 0 } },
+ '2024-07-05': { sms: { delivered: 90, failed: 3 } },
+ '2024-07-06': { sms: { delivered: 100, failed: 4 } },
+ '2024-07-07': { sms: { delivered: 110, failed: 2 } },
+ };
+
+ const socket = {
+ on: jest.fn((event, callback) => {
+ if (event === 'daily_stats_update') {
+ callback(mockData);
+ done();
+ }
+ }),
+ emit: jest.fn(),
+ };
+ window.io = jest.fn(() => socket);
+
+ document.dispatchEvent(new Event('DOMContentLoaded'));
+
+ setTimeout(() => {
+ const table = document.getElementById('weeklyTable');
+ expect(table).toBeDefined();
+
+ const rows = table.getElementsByTagName('tr');
+ expect(rows.length).toBe(8);
+
+ const firstRowCells = rows[1].getElementsByTagName('td');
+ console.log('First row cells:', firstRowCells);
+ expect(firstRowCells[0].textContent).toBe('07/01/24');
+ expect(firstRowCells[1].textContent).toBe('50');
+ expect(firstRowCells[2].textContent).toBe('5');
+ }, 100);
+});
diff --git a/tests/javascripts/totalMessagesChart.test.js b/tests/javascripts/totalMessagesChart.test.js
index f0d7ee55d..87c671430 100644
--- a/tests/javascripts/totalMessagesChart.test.js
+++ b/tests/javascripts/totalMessagesChart.test.js
@@ -15,10 +15,11 @@ function loadScript(scriptContent) {
Object.defineProperty(HTMLElement.prototype, 'clientWidth', {
value: 600,
writable: true,
+ configurable: true,
});
// beforeAll hook to set up the DOM and load D3.js script
-beforeAll(done => {
+beforeEach(() => {
// Set up the DOM with the D3 script included
document.body.innerHTML = `
@@ -33,15 +34,13 @@ beforeAll(done => {
loadScript(d3ScriptContent);
// Wait a bit to ensure the script is executed
- setTimeout(() => {
- // Require the actual JavaScript file you are testing
- require('../../app/assets/javascripts/totalMessagesChart.js');
-
- // Call the function to create the chart
- window.createTotalMessagesChart();
-
- done();
- }, 100);
+ return new Promise(resolve => {
+ setTimeout(() => {
+ // Require the actual JavaScript file you are testing
+ require('../../app/assets/javascripts/totalMessagesChart.js');
+ resolve();
+ }, 100);
+ });
});
// Single test to check if D3 is loaded correctly
@@ -52,15 +51,20 @@ test('D3 is loaded correctly', () => {
});
// Test to check if the SVG element is correctly set up
-test('SVG element is correctly set up', () => {
- const svg = document.getElementById('totalMessageChart');
- expect(svg).not.toBeNull();
- expect(svg.getAttribute('width')).toBe('600');
- expect(svg.getAttribute('height')).toBe('64');
+test('SVG element is correctly set up', done => {
+ window.createTotalMessagesChart();
+
+ setTimeout(() => {
+ const svg = document.getElementById('totalMessageChart');
+ expect(svg.getAttribute('width')).toBe('600');
+ expect(svg.getAttribute('height')).toBe('48');
+ done();
+ }, 1000); // Ensure enough time for the DOM updates
});
// Test to check if the table is created and populated correctly
test('Populates the accessible table correctly', () => {
+ window.createTotalMessagesChart();
const table = document.getElementById('totalMessageTable').getElementsByTagName('table')[0];
expect(table).toBeDefined();
@@ -84,6 +88,8 @@ test('Chart title is correctly set', () => {
// Test to check if the chart resizes correctly on window resize
test('Chart resizes correctly on window resize', done => {
+ window.createTotalMessagesChart();
+
setTimeout(() => {
const svg = document.getElementById('totalMessageChart');
const chartContainer = document.getElementById('totalMessageChartContainer');
@@ -92,7 +98,7 @@ test('Chart resizes correctly on window resize', done => {
expect(svg.getAttribute('width')).toBe('600');
// Set new container width
- Object.defineProperty(chartContainer, 'clientWidth', { value: 800 });
+ Object.defineProperty(chartContainer, 'clientWidth', { value: 800, configurable: true });
// Trigger resize event
window.dispatchEvent(new Event('resize'));
@@ -101,9 +107,9 @@ test('Chart resizes correctly on window resize', done => {
// Check if SVG width is updated
expect(svg.getAttribute('width')).toBe('800');
done();
- }, 500); // Adjust the timeout if necessary
+ }, 1000); // Adjust the timeout if necessary
}, 1000); // Initial wait for the chart to render
-}, 10000); // Adjust the overall test timeout if necessary
+}, 15000); // Adjust the overall test timeout if necessary
// Testing the tooltip
test('Tooltip displays on hover', () => {
@@ -148,11 +154,12 @@ test('Tooltip displays on hover', () => {
// Test to ensure SVG bars are created and animated correctly
test('SVG bars are created and animated correctly', done => {
+ window.createTotalMessagesChart();
const svg = document.getElementById('totalMessageChart');
// Initial check
const sentBar = svg.querySelector('rect[fill="#0076d6"]');
- const remainingBar = svg.querySelector('rect[fill="#fa9441"]');
+ const remainingBar = svg.querySelector('rect[fill="#C7CACE"]');
expect(sentBar).not.toBeNull();
expect(remainingBar).not.toBeNull();