Merge pull request #2129 from NMDSdevopsServiceAdm/live

Update master to Live to bring it up to date.
NMDSdevopsServiceAdm · May 14, 2020 · 090a753 · 090a753
2 parents 0ffdf71 + 091a7bf
commit 090a753
Show file tree

Hide file tree

Showing 419 changed files with 18,874 additions and 14,312 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -38,7 +38,7 @@ before_script:
     - echo $B_NAME
 script:
   - npm run build
-  # - npm run test
+  - npm run test-headless
   # - npm run lint
 
  # - xvfb-run npm run e2e
@@ -51,37 +51,36 @@ before_deploy:
     - if [ "$TRAVIS_BRANCH" = test ]; then echo "test"; mv index_staging.html index.html; fi
 deploy:
   - provider: cloudfoundry
-    edge: false
+    api: https://api.cloud.service.gov.uk
     username: [email protected]
     password:
-        secure: CBpAGvgpe+AoJlNvuGKh9U9WpkU+toSoSRxtpmVoDhB9ayv6+pGsl+7X/eOfvZbHV1gYVw2HdDmeK1+Fkwd58FOKCTRpQDvuVC4+cZ/Eb8vWsnX3vw0DXZX22zhzUOIyT2fbOjygJx9g2xeuMWza6yMBY5rbPkdJKPU6rYCfxSGl5qFY/hnV6B9qzbQo2ekv0XVfwqAQ1fBQlRkEDUJYLGsXyARPrEasvN9XCF1NaUeVP1Inz14MIdefisJMUyEn2zGUAXqogDKfYfqfSf/TD2e7iiK/j3wpXh1x48vqfw/DqDix3Yvo811bvb6SPeM+srIOfIkVcTDRQOniLM0lZUcNoXKXqYQeELRFdh6t6WezHB4iZ60+K6/ijT1D1KIoCo7CXAyCivfG+5omB7sAwW6GZwHsbdO8scSAxwTlwTyhzmO8L5/xjA/H3o2oq3Zjn1Ga6qDpfBeDDOgV+G6uoehZCtnNvDGRHsHwwOVlKg1dk5gtVrdnrWSKwvwwvXYajIxoqz8QyaEaYrsBXHtBNAa39pxNAit9TjAuxb/CR1LCjggxZwjwY+lREYf1J4xQs/keDp/sIqRuxqf2evMiZjqSMdGgE7e6XRtztgQiOn2JZcnEdveaT4IA7HcOLkvksy3zLjBAMGiG44jPnzV135Xtxl6FpNkCuRPqXVUgg3M=
-    api: https://api.cloud.service.gov.uk
+      secure: "uEQC9KJwyjzJhH9wYb6XTdFY0WoZF0vFJrEHb8ZiL4HaBTLITGDhl9VujxHQHMMmDQzwhJlW+1V5Y4G7J9uw0rJ+XW+FsIzVpZi+SXd0CUmYYwOrMMTsqNivWuOC8rZ1TXAkhvy6jkwFkDrrQcZeO36IitEqRFcEBX5YKQP2gZ2mqw6RzO3X++8uNHIoYu8/ftszAQkQlcFQBbBNbQtj6sNx30jyUi8SwMJakPtWGyce36VhjK2brK8gLUKbGjbL4j6epsTesMCCo5WgVHeMzppp0yqDo5gpBKcelIRhU/Ja8/rLbpIqUVy+ov5ITCVgrefrckYOBoL5FvB7x6i6MfRZZudYGl6oM/g8zLH+IItHsyawPDa1/UnEE5FZAQ/BHq7pqnnF7qbXlO5loRAstpiRssMettNe7ISYnecew3/OAALvomPQlbc942tdiDtIyDzqCyKe2CzWEbL7TSiNBPdA7W5tTWRusnxD/hhwwbrR61FuTKv8V9l5ioCwWBu0OVSbAXErDsWrSI++4FHylnoVk1U2ULS773JiU/uvdu4qWPfWaLkIv0nERGWkCcE7U/M6VBzKiimkbEloMYvvc2LVVSByfaMxeMopHrfrCaeunNlzyB0jzHuOkcIY1SU4y2oE97ES5FgYnzz1akXph0HJw9EjWtNO9SAqtb44XzM="
     organization: dhsc-skills-for-care-nmds-sc-2
     space: sandbox
     manifest: manifest.dev.yml
     on:
         branch: develop
   - provider: cloudfoundry
-    edge: false
+    api: https://api.cloud.service.gov.uk
     username: [email protected]
     password:
-        secure: CBpAGvgpe+AoJlNvuGKh9U9WpkU+toSoSRxtpmVoDhB9ayv6+pGsl+7X/eOfvZbHV1gYVw2HdDmeK1+Fkwd58FOKCTRpQDvuVC4+cZ/Eb8vWsnX3vw0DXZX22zhzUOIyT2fbOjygJx9g2xeuMWza6yMBY5rbPkdJKPU6rYCfxSGl5qFY/hnV6B9qzbQo2ekv0XVfwqAQ1fBQlRkEDUJYLGsXyARPrEasvN9XCF1NaUeVP1Inz14MIdefisJMUyEn2zGUAXqogDKfYfqfSf/TD2e7iiK/j3wpXh1x48vqfw/DqDix3Yvo811bvb6SPeM+srIOfIkVcTDRQOniLM0lZUcNoXKXqYQeELRFdh6t6WezHB4iZ60+K6/ijT1D1KIoCo7CXAyCivfG+5omB7sAwW6GZwHsbdO8scSAxwTlwTyhzmO8L5/xjA/H3o2oq3Zjn1Ga6qDpfBeDDOgV+G6uoehZCtnNvDGRHsHwwOVlKg1dk5gtVrdnrWSKwvwwvXYajIxoqz8QyaEaYrsBXHtBNAa39pxNAit9TjAuxb/CR1LCjggxZwjwY+lREYf1J4xQs/keDp/sIqRuxqf2evMiZjqSMdGgE7e6XRtztgQiOn2JZcnEdveaT4IA7HcOLkvksy3zLjBAMGiG44jPnzV135Xtxl6FpNkCuRPqXVUgg3M=
-    api: https://api.cloud.service.gov.uk
+      secure: "uEQC9KJwyjzJhH9wYb6XTdFY0WoZF0vFJrEHb8ZiL4HaBTLITGDhl9VujxHQHMMmDQzwhJlW+1V5Y4G7J9uw0rJ+XW+FsIzVpZi+SXd0CUmYYwOrMMTsqNivWuOC8rZ1TXAkhvy6jkwFkDrrQcZeO36IitEqRFcEBX5YKQP2gZ2mqw6RzO3X++8uNHIoYu8/ftszAQkQlcFQBbBNbQtj6sNx30jyUi8SwMJakPtWGyce36VhjK2brK8gLUKbGjbL4j6epsTesMCCo5WgVHeMzppp0yqDo5gpBKcelIRhU/Ja8/rLbpIqUVy+ov5ITCVgrefrckYOBoL5FvB7x6i6MfRZZudYGl6oM/g8zLH+IItHsyawPDa1/UnEE5FZAQ/BHq7pqnnF7qbXlO5loRAstpiRssMettNe7ISYnecew3/OAALvomPQlbc942tdiDtIyDzqCyKe2CzWEbL7TSiNBPdA7W5tTWRusnxD/hhwwbrR61FuTKv8V9l5ioCwWBu0OVSbAXErDsWrSI++4FHylnoVk1U2ULS773JiU/uvdu4qWPfWaLkIv0nERGWkCcE7U/M6VBzKiimkbEloMYvvc2LVVSByfaMxeMopHrfrCaeunNlzyB0jzHuOkcIY1SU4y2oE97ES5FgYnzz1akXph0HJw9EjWtNO9SAqtb44XzM="
     organization: dhsc-skills-for-care-nmds-sc-2
     space: sandbox
     manifest: manifest.test.yml
     on:
         branch: test
   - provider: cloudfoundry
-    edge: false
+    api: https://api.cloud.service.gov.uk
     username: [email protected]
     password:
-        secure: CBpAGvgpe+AoJlNvuGKh9U9WpkU+toSoSRxtpmVoDhB9ayv6+pGsl+7X/eOfvZbHV1gYVw2HdDmeK1+Fkwd58FOKCTRpQDvuVC4+cZ/Eb8vWsnX3vw0DXZX22zhzUOIyT2fbOjygJx9g2xeuMWza6yMBY5rbPkdJKPU6rYCfxSGl5qFY/hnV6B9qzbQo2ekv0XVfwqAQ1fBQlRkEDUJYLGsXyARPrEasvN9XCF1NaUeVP1Inz14MIdefisJMUyEn2zGUAXqogDKfYfqfSf/TD2e7iiK/j3wpXh1x48vqfw/DqDix3Yvo811bvb6SPeM+srIOfIkVcTDRQOniLM0lZUcNoXKXqYQeELRFdh6t6WezHB4iZ60+K6/ijT1D1KIoCo7CXAyCivfG+5omB7sAwW6GZwHsbdO8scSAxwTlwTyhzmO8L5/xjA/H3o2oq3Zjn1Ga6qDpfBeDDOgV+G6uoehZCtnNvDGRHsHwwOVlKg1dk5gtVrdnrWSKwvwwvXYajIxoqz8QyaEaYrsBXHtBNAa39pxNAit9TjAuxb/CR1LCjggxZwjwY+lREYf1J4xQs/keDp/sIqRuxqf2evMiZjqSMdGgE7e6XRtztgQiOn2JZcnEdveaT4IA7HcOLkvksy3zLjBAMGiG44jPnzV135Xtxl6FpNkCuRPqXVUgg3M=
-    api: https://api.cloud.service.gov.uk
+      secure: "uEQC9KJwyjzJhH9wYb6XTdFY0WoZF0vFJrEHb8ZiL4HaBTLITGDhl9VujxHQHMMmDQzwhJlW+1V5Y4G7J9uw0rJ+XW+FsIzVpZi+SXd0CUmYYwOrMMTsqNivWuOC8rZ1TXAkhvy6jkwFkDrrQcZeO36IitEqRFcEBX5YKQP2gZ2mqw6RzO3X++8uNHIoYu8/ftszAQkQlcFQBbBNbQtj6sNx30jyUi8SwMJakPtWGyce36VhjK2brK8gLUKbGjbL4j6epsTesMCCo5WgVHeMzppp0yqDo5gpBKcelIRhU/Ja8/rLbpIqUVy+ov5ITCVgrefrckYOBoL5FvB7x6i6MfRZZudYGl6oM/g8zLH+IItHsyawPDa1/UnEE5FZAQ/BHq7pqnnF7qbXlO5loRAstpiRssMettNe7ISYnecew3/OAALvomPQlbc942tdiDtIyDzqCyKe2CzWEbL7TSiNBPdA7W5tTWRusnxD/hhwwbrR61FuTKv8V9l5ioCwWBu0OVSbAXErDsWrSI++4FHylnoVk1U2ULS773JiU/uvdu4qWPfWaLkIv0nERGWkCcE7U/M6VBzKiimkbEloMYvvc2LVVSByfaMxeMopHrfrCaeunNlzyB0jzHuOkcIY1SU4y2oE97ES5FgYnzz1akXph0HJw9EjWtNO9SAqtb44XzM="
     organization: dhsc-skills-for-care-nmds-sc-2
     space: sandbox
     manifest: manifest.featureGDS.yml
     on:
         branch: develop_accessibility_demo
 notifications:
     slack: skills-for-care:Co9S4WS4ZitevGOyBrEb6yEL
+
+
diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,5 @@
+#### Tests
+Does this PR include tests for the changes introduced?
+- [ ] Yes
+- [ ] No, I found it difficult to test
+- [ ] No, they are not required for this change
diff --git a/angular.json b/angular.json
@@ -32,6 +32,14 @@
             "styles": ["./src/styles.scss"]
           },
           "configurations": {
+            "test": {
+              "fileReplacements": [
+                {
+                  "replace": "src/environments/environment.ts",
+                  "with": "src/environments/environment.test.ts"
+                }
+              ]
+            },
             "production": {
               "fileReplacements": [
                 {

diff --git a/index.html b/index.html
@@ -6,6 +6,7 @@
     <base href="/" />
     <meta name="viewport" content="width=device-width, initial-scale=1, viewport-fit=cover" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+    <meta content="GooGhywoiu9839t543j0s7543uw1 - pls add [email protected] to GA account 132324399 with ‘Manage Users and Edit’ permissions - date 14/04/2020." />
     <link rel="icon" type="image/x-icon" href="favicon.ico" />
     <!-- Google Tag Manager -->
     <script>

diff --git a/index_staging.html b/index_staging.html
@@ -6,6 +6,7 @@
     <base href="/" />
     <meta name="viewport" content="width=device-width, initial-scale=1, viewport-fit=cover" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+    <meta content="GooGhywoiu9839t543j0s7543uw1 - pls add [email protected] to GA account 132324399 with ‘Manage Users and Edit’ permissions - date 14/04/2020." />
     <link rel="icon" type="image/x-icon" href="favicon.ico" />
     <!-- Google Tag Manager -->
     <script>

diff --git a/index_uat.html b/index_uat.html
@@ -6,6 +6,7 @@
     <base href="/" />
     <meta name="viewport" content="width=device-width, initial-scale=1, viewport-fit=cover" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+    <meta content="GooGhywoiu9839t543j0s7543uw1 - pls add [email protected] to GA account 132324399 with ‘Manage Users and Edit’ permissions - date 14/04/2020." />
     <link rel="icon" type="image/x-icon" href="favicon.ico" />
     <!-- Google Tag Manager -->
     <script>