et_full_system 3.0.6 → 4.0.0.pre.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9c390f6a9b04f6c3882ff3d266111d0eba517a3a3026dfa25e8b6c1455307a9
-  data.tar.gz: cb09cb0300ae43234c4b03bc207eddbfd287c4a52efa391342c56f6827914b9e
+  metadata.gz: e987a3724e9e25d4b8dc70b5cbf3294963d2a3dd37cca5c0186124afe0b840e6
+  data.tar.gz: 7968ec2c06ede9a1618167c7b0c2804373f2462b2c4a38098367791014bb0009
 SHA512:
-  metadata.gz: 577d97b057127bbcb9d5966001aa155ce0e476f6f5f80eb9c225fd65ad48728ee45d790d82745587ff8f0bc00849b7a732da8c372f605eb3c709f3eac18af772
-  data.tar.gz: 7e9e8779bd339e066553ed99e20044eae6c4b0f4de823cd05347b5a2662a976179028ca5176ff74622eb2d8881389aa42c1752240dd07820315386c1179abdac
+  metadata.gz: fc92141b85627f076811705b5847f7c921b05bf07827c31ac34303b4c6e24bc356e8851242b05d655acf6ba5cf5994ebb4946e583ed02d59d6d7ba0e93a2a3be
+  data.tar.gz: 7f9e899eea0e334a6a7e35092781023239cc4c5abd90aa182bdc186e28b894f394ac4f36a2d91fe49835d07e2d0a370849f2c96865974f493ec69757f4d1ae20

data/Gemfile.lock

@@ -1,11 +1,12 @@
 PATH
   remote: .
   specs:
-    et_full_system (3.0.6)
+    et_full_system (4.0.0.pre.rc2)
       aws-sdk-s3 (~> 1.9)
       azure-storage (~> 0.15.0.preview)
       dotenv (~> 2.7, >= 2.7.2)
       et_fake_ccd (~> 1.0)
+      gov_fake_notify (~> 1.1)
       httparty (~> 0.16)
       thor (~> 1.0)
 
@@ -22,21 +23,21 @@ GEM
       zeitwerk (~> 2.3)
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
-    aws-eventstream (1.1.1)
-    aws-partitions (1.492.0)
-    aws-sdk-core (3.119.1)
+    aws-eventstream (1.2.0)
+    aws-partitions (1.507.0)
+    aws-sdk-core (3.121.1)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-kms (1.47.0)
-      aws-sdk-core (~> 3, >= 3.119.0)
+    aws-sdk-kms (1.48.0)
+      aws-sdk-core (~> 3, >= 3.120.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.100.0)
-      aws-sdk-core (~> 3, >= 3.119.0)
+    aws-sdk-s3 (1.103.0)
+      aws-sdk-core (~> 3, >= 3.120.0)
       aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.2.4)
+      aws-sigv4 (~> 1.4)
+    aws-sigv4 (1.4.0)
       aws-eventstream (~> 1, >= 1.0.2)
     azure-core (0.1.15)
       faraday (~> 0.9)
@@ -61,7 +62,15 @@ GEM
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.14.0)
       faraday (>= 0.7.4, < 1.0)
-    httparty (0.18.1)
+    gov_fake_notify (1.1.1)
+      activemodel (>= 5.2.3)
+      iodine (~> 0.7)
+      jwt (~> 2.2, >= 2.2.3)
+      mail (~> 2.7, >= 2.7.1)
+      roda (~> 3.48)
+      thor (~> 1.1)
+      tilt (~> 2.0, >= 2.0.10)
+    httparty (0.19.0)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
     i18n (1.8.10)
@@ -70,21 +79,25 @@ GEM
     jmespath (1.4.0)
     json-schema (2.8.1)
       addressable (>= 2.4)
+    jwt (2.2.3)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.0704)
+    mime-types-data (3.2021.0901)
+    mini_mime (1.1.1)
     mini_portile2 (2.6.1)
     minitest (5.14.4)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
-    nokogiri (1.12.4)
+    nokogiri (1.12.5)
       mini_portile2 (~> 2.6.1)
       racc (~> 1.4)
     public_suffix (4.0.6)
     racc (1.5.2)
     rack (2.2.3)
     rake (13.0.1)
-    roda (3.47.0)
+    roda (3.48.0)
       rack
     rotp (6.2.0)
     thor (1.1.0)

data/docker/docker-compose.yml

@@ -137,46 +137,6 @@ services:
       - "localhost.from.docker:${LOCALHOST_FROM_DOCKER_IP:-127.255.255.255}"
     networks:
       - et_full_system
-  zalenium:
-    image: "dosel/zalenium"
-    container_name: zalenium
-    hostname: zalenium
-    tty: true
-    volumes:
-      - zalenium_videos:/home/seluser/videos
-      - /var/run/docker.sock:/var/run/docker.sock
-    ports:
-      - 4444:4444
-    extra_hosts:
-      - "localhost.from.docker:${LOCALHOST_FROM_DOCKER_IP}"
-    networks:
-      - et_full_system
-    command: >
-      start --desiredContainers 2
-            --maxDockerSeleniumContainers 8
-            --screenWidth 1024 --screenHeight 768
-            --timeZone "Europe/Berlin"
-            --videoRecordingEnabled ${RECORD_VIDEO:-'false'}
-            --sauceLabsEnabled 'false'
-            --browserStackEnabled 'false'
-            --testingBotEnabled 'false'
-            --cbtEnabled 'false'
-            --lambdaTestEnabled 'false'
-            --startTunnel 'false'
-    environment:
-      - HOST_UID
-      - HOST_GID
-      - SAUCE_USERNAME
-      - SAUCE_ACCESS_KEY
-      - BROWSER_STACK_USER
-      - BROWSER_STACK_KEY
-      - TESTINGBOT_KEY
-      - TESTINGBOT_SECRET
-      - CBT_USERNAME
-      - CBT_AUTHKEY
-      - LT_USERNAME
-      - LT_ACCESS_KEY
-      - PULL_SELENIUM_IMAGE='true'
 volumes:
   rvm:
   global_node_modules:
@@ -197,7 +157,6 @@ volumes:
   atos_bundle:
   db_data:
   redis_data:
-  zalenium_videos:
 
 networks:
   et_full_system:

data/et_full_system.gemspec

@@ -28,6 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'azure-storage', '~> 0.15.0.preview'
   spec.add_dependency 'dotenv', '~> 2.7', '>= 2.7.2'
   spec.add_dependency 'et_fake_ccd', '~> 1.0'
-
+  spec.add_dependency 'gov_fake_notify', '~> 1.1'
+  
   spec.add_development_dependency "rake", "~> 13.0"
 end

data/foreman/Procfile

@@ -11,4 +11,5 @@ s3_web: bash --login -c "godotenv -f ${FOREMAN_PATH}/minio.env minio server ${MI
 azure_blob_web: bash --login -c "azurite -l ${AZURITE_STORAGE_PATH} -d ${AZURITE_STORAGE_PATH}/debug.log"
 fake_acas_web: export FREEPORT=$(freeport) && bash --login -c "cd ${FS_ROOT_PATH} && et_full_system local wait_for_support && et_full_system local update_service_url fake_acas http://localhost:$FREEPORT && rvm use && et_fake_acas_server -port $FREEPORT -threads=1 -workers=2"
 fake_ccd_web: export FREEPORT=$(freeport) && bash --login -c "cd ${FS_ROOT_PATH} && et_full_system local wait_for_support && et_full_system local update_service_url fake_ccd http://localhost:$FREEPORT && rvm use && et_fake_ccd start --port=$FREEPORT --create_case_schema=./systems/et_ccd_export/spec/json_schemas/case_create.json"
+fake_notify_web: export FREEPORT=$(freeport) && godotenv -f ${FOREMAN_PATH}/.env godotenv -f ${FOREMAN_PATH}/fake_notify.env bash --login -c "cd ${FS_ROOT_PATH} && et_full_system local wait_for_support && et_full_system local update_service_url fake_notify http://localhost:$FREEPORT && rvm use && gov_fake_notify start --port=$FREEPORT --config=${FOREMAN_PATH}/gov_fake_notify.yaml"
 et_ccd_export_sidekiq: bash --login -c "cd ${FS_ROOT_PATH} && et_full_system local wait_for_support && cd systems/et_ccd_export && godotenv -f ${FOREMAN_PATH}/.env godotenv -f ${FOREMAN_PATH}/et_ccd_export.env ./run_sidekiq.sh"

data/foreman/fake_notify.env

@@ -0,0 +1,3 @@
+GOV_FAKE_NOTIFY_SMTP_HOSTNAME=${SMTP_HOSTNAME}
+GOV_FAKE_NOTIFY_SMTP_PORT=${SMTP_PORT}
+GOV_FAKE_NOTIFY_BASE_URL='http://notify.et.127.0.0.1.nip.io:3100'

data/foreman/gov_fake_notify.yaml

@@ -0,0 +1,110 @@
+---
+  delivery_method: smtp
+  include_templates:
+  - id: a55e0b84-8d65-4bf4-93a7-e974e0d8d48d
+    name: et1-confirmation-email-v1-en
+    subject: "Employment tribunal: claim submitted"
+    message: |
+      Claim number: ((claim.reference))
+
+      ((primary_claimant.first_name)) ((primary_claimant.last_name))
+      
+      Thank you for submitting your claim to an employment tribunal.
+      
+      ---
+      
+      WHAT HAPPENS NEXT
+      
+      We'll contact you once we have sent your claim to the respondent and explain what happens next.
+      At present, this is taking us an average of 25 days.
+      Once we have sent them your claim, the respondent has 28 days to reply.
+      
+      ---
+      
+      SUBMISSION DETAILS
+      
+      Claim submitted:       ((submitted_date))
+      Tribunal office:       ((office.name))
+      Contact: ((office.email)), ((office.telephone))
+      
+      ---
+      
+      Please use the link below to download a copy of your claim.
+      ((link_to_pdf))
+      
+      ---
+      
+      Additional Information File
+      
+      ((link_to_additional_info))
+      
+      ---
+      
+      Group Claim File
+      
+      ((link_to_claimants_file))
+      
+      ---
+      
+      
+      
+      Your feedback helps us improve this service:
+      https://www.gov.uk/done/employment-tribunals-make-a-claim
+      
+      Help us keep track. Complete our diversity monitoring questionnaire.
+      https://employmenttribunals.service.gov.uk/en/apply/diversity
+      
+      Contact us: http://www.justice.gov.uk/contacts/hmcts/tribunals/employment
+  - id: 97a117f1-727d-4631-bbc6-b2bc98d30a0f
+    name: et1-confirmation-email-v1-cy
+    subject: "Tribiwnlys Cyflogaeth: hawliad wedi’i gyflwyno"
+    message: |
+      Eich rhif hawliad: ((claim.reference))
+
+      ((primary_claimant.first_name)) ((primary_claimant.last_name))
+      Diolch am gyflwyno eich hawliad i dribiwnlys cyflogaeth.
+      ---
+      
+      BETH SY'N DIGWYDD NESAF
+      
+      Byddwn yn cysylltu â chi unwaith y byddwn wedi anfon eich hawliad at yr atebydd i egluro beth fydd yn digwydd nesaf. Ar hyn o bryd, mae’n cymryd oddeutu 25 diwrnod.
+      Unwaith y byddwn wedi anfon eich hawliad atynt, mae gan yr atebydd 28 diwrnod i ymateb.
+      
+      ---
+      
+      MANYLION CYFLWYNO
+      
+      Hawliad wedi'i gyflwyno:      Cyflwynwyd ar ((submitted_date))
+      Swyddfa tribiwnlys:           Cymru, Tribiwnlys Cyflogaeth
+      Cyswllt: ((office.email)), 0300 303 0654
+      
+      ---     
+      
+      Defnyddiwch y ddolen isod i lawrlwytho copi o’ch hawliad.
+      ((link_to_pdf))
+      
+      ---
+      
+      Ffeil Gwybodaeth Ychwanegol
+      
+      ((link_to_additional_info))
+      
+      ---
+      
+      Hawliad Grŵp
+      
+      ((link_to_claimants_file))
+      
+      ---
+      
+      Mae eich adborth yn ein helpu i wella'r gwasanaeth hwn:
+      https://www.gov.uk/done/employment-tribunals-make-a-claim
+      
+      Helpwch ni i gadw cofnodion cywir . Llenwch ein holiadur monitro amrywiaeth.
+      https://employmenttribunals.service.gov.uk/en/apply/diversity
+      
+      Cysylltu â ni: http://www.justice.gov.uk/contacts/hmcts/tribunals/employment
+  include_api_keys: 
+  - service_name: Employment Tribunals
+    service_email: employmenttribunals@email.com
+    key: fake-key-7fc24bc8-1938-1827-bed3-fb237f9cd5e7-c34b3015-02a1-4e01-b922-1ea21f331d4d

data/foreman/traefik.json

@@ -79,6 +79,14 @@
           "weight": 1
         }
       }
+    },
+    "fake_notify": {
+      "servers": {
+        "web": {
+          "url": "http://localhost:11603",
+          "weight": 1
+        }
+      }
     }
 
 
@@ -203,6 +211,18 @@
           "rule": "Host:ccd.et.127.0.0.1.nip.io"
         }
       }
+    },
+    "fake_notify": {
+      "entryPoints": [
+        "http"
+      ],
+      "backend": "fake_notify",
+      "passHostHeader": true,
+      "routes": {
+        "test_1": {
+          "rule": "Host:notify.et.127.0.0.1.nip.io"
+        }
+      }
     }
   }
 }

data/lib/et_full_system/cli/docker/server.rb

@@ -14,7 +14,6 @@ module EtFullSystem
         method_option :use_selenium, type: :boolean, default: false, aliases: 'use-selenium', desc: 'Only used if with_test is true - says to use selenium in preference to zalenium'
         method_option :chrome_instances, type: :numeric, default: 1, aliases: 'chrome-instances', desc: 'Specify the number of chrome instances for selenium'
         method_option :firefox_instances, type: :numeric, default: 1, aliases: 'firefox-instances', desc: 'Specify the number of firefox instances for selenium'
-        method_option :record_video, type: :boolean, default: false, aliases: 'record-video', desc: 'When using zalenium, enable video recording'
         method_option :minimal, type: :boolean, default: false, desc: 'Set to true to only start the minimum (db, redis, mail, s3, azure blob, fake_acas, fake_ccd)'
         def up(*args)
           unbundled do
@@ -42,9 +41,6 @@ module EtFullSystem
             else
               extra_args.concat(['--scale selenium-hub=0', '--scale chrome=0', '--scale firefox=0'])
             end
-            unless options.with_test? && !options.use_selenium?
-              extra_args.concat(['--scale zalenium=0'])
-            end
             env_vars << "DB_PORT=#{ENV.fetch('DB_PORT', EtFullSystem.is_port_open?(5432) ? 0 : 5432)}"
             env_vars << "REDIS_PORT=#{ENV.fetch('REDIS_PORT', EtFullSystem.is_port_open?(6379) ? 0 : 6379)}"
             gem_root = File.absolute_path('../../../..', __dir__)

data/lib/et_full_system/version.rb

@@ -1,3 +1,3 @@
 module EtFullSystem
-  VERSION = "3.0.6"
+  VERSION = "4.0.0-rc2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: et_full_system
 version: !ruby/object:Gem::Version
-  version: 3.0.6
+  version: 4.0.0.pre.rc2
 platform: ruby
 authors:
 - Gary Taylor
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-08-31 00:00:00.000000000 Z
+date: 2021-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -100,6 +100,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: gov_fake_notify
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -149,6 +163,8 @@ files:
 - foreman/et_api.env
 - foreman/et_atos.env
 - foreman/et_ccd_export.env
+- foreman/fake_notify.env
+- foreman/gov_fake_notify.yaml
 - foreman/mailhog.env
 - foreman/minio.env
 - foreman/ports.env
@@ -181,11 +197,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Runs the employment tribunals system - all services and background jobs