Merge branch 'feature/CB2-12113' of https://github.com/dvsa/cvs-tsk-u…

…pdate-store into feature/CB2-11268
dvsa · May 9, 2024 · 4178ca2 · 4178ca2
2 parents bdfb4e4 + c7fd6b5
commit 4178ca2
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -86,7 +86,7 @@ On Windows, you will need to manually run:
 * Confirm: `echo %USE_CONTAINERIZED_DATABASE%` should return `1`before the above, or run these tests with an IntelliJ configuration which sets the right environment variable for you.
 
 On Tanio Artino's advice, there is a distinction between running integration tests locally, and running them on Jenkins.
-* `USE_CONTAINERIZED_DATABASE=0` will attempt to talk to `localhost:3306`. This only works if you manually start a DB or, in the case of Jenkins, if there is a pre-existing DB running on port `3306`.
+* `USE_CONTAINERIZED_DATABASE=0` will attempt to talk to `127.0.0.1:3306`. This only works if you manually start a DB or, in the case of Jenkins, if there is a pre-existing DB running on port `3306`.
 * `USE_CONTAINERIZED_DATABASE=1` will spin up a TC container as described above.
 
 To run the "Jenkins" version, e.g. `USE_CONTAINERIZED_DATABASE=0`, use:

diff --git a/sonar-project.properties b/sonar-project.properties
@@ -5,7 +5,7 @@ sonar.projectKey=org.sonarqube:cvs-tsk-update-store
 # this is the name and version displayed in the SonarQube UI. Was mandatory prior to SonarQube 6.1.
 sonar.projectName=cvs-tsk-update-store
 
-sonar.host.url=http://localhost:9000
+sonar.host.url=http://127.0.0.1:9000
 
 sonar.projectVersion=1.0
 sonar.sourceEncoding=UTF-8

diff --git a/tests/integration/auth-into-service-document-conversion.intTest.ts b/tests/integration/auth-into-service-document-conversion.intTest.ts
@@ -23,7 +23,7 @@ describe("convertTechRecordDocument() integration tests", () => {
       container = await getContainerizedDatabase();
     } else {
       (getConnectionPoolOptions as jest.Mock) = jest.fn().mockResolvedValue({
-        host: "localhost",
+        host: "127.0.0.1",
         port: "3306",
         user: "root",
         password: "12345",

diff --git a/tests/integration/cvsbnop-container.ts b/tests/integration/cvsbnop-container.ts
@@ -36,7 +36,7 @@ export const getContainerizedDatabase = async (): Promise<StartedTestContainer>
     "--password",
     "12345",
     "--url",
-    `jdbc:mysql://localhost:${hostPort}/${databaseName}`,
+    `jdbc:mysql://127.0.0.1:${hostPort}/${databaseName}`,
     "--classpath",
     `${pathToResources()}/mysql-connector-java-8.0.23.jar`,
     "update",

diff --git a/tests/integration/tech-record-document-conversion.intTest.ts b/tests/integration/tech-record-document-conversion.intTest.ts
@@ -23,7 +23,7 @@ describe("convertTechRecordDocument() integration tests", () => {
       container = await getContainerizedDatabase();
     } else {
       (getConnectionPoolOptions as jest.Mock) = jest.fn().mockResolvedValue({
-        host: "localhost",
+        host: "127.0.0.1",
         port: "3306",
         user: "root",
         password: "12345",

diff --git a/tests/integration/test-results-conversion-with-delete.intTest.ts b/tests/integration/test-results-conversion-with-delete.intTest.ts
@@ -54,7 +54,7 @@ describe("convertTestResults() integration tests with delete", () => {
       container = await getContainerizedDatabase();
     } else {
       (getConnectionPoolOptions as jest.Mock) = jest.fn().mockResolvedValue({
-        host: "localhost",
+        host: "127.0.0.1",
         port: "3306",
         user: "root",
         password: "12345",

diff --git a/tests/integration/test-results-conversion-with-upsert.intTest.ts b/tests/integration/test-results-conversion-with-upsert.intTest.ts
@@ -54,7 +54,7 @@ describe("convertTestResults() integration tests with upsert", () => {
       container = await getContainerizedDatabase();
     } else {
       (getConnectionPoolOptions as jest.Mock) = jest.fn().mockResolvedValue({
-        host: "localhost",
+        host: "127.0.0.1",
         port: "3306",
         user: "root",
         password: "12345",

diff --git a/tests/utils.ts b/tests/utils.ts
@@ -25,7 +25,7 @@ export const useLocalDb = (): void => {
     username: "root",
     password: "12345",
     engine: "",
-    host: "localhost",
+    host: "127.0.0.1",
     port: 3306,
     dbname: "",
     dbClusterIdentifier: "",