Move authenticate step into wizard

This is mostly shared between the GiT app and TTA app, so moving it into the gem.
DFE-Digital · Oct 20, 2021 · 1f3624e · 1f3624e
1 parent ed34bad
commit 1f3624e
Show file tree

Hide file tree

Showing 11 changed files with 8 additions and 184 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/DFE-Digital/dfe_wizard.git
-  revision: 4ab1ef8f0cf5c09d64ac0329001595f8bf4520e7
+  revision: 3b8fb44c760a0e342d89ed7a4824733a224646b0
   branch: move-extra-controller-code
   specs:
     dfe_wizard (0.1.0)

diff --git a/app/models/callbacks/wizard.rb b/app/models/callbacks/wizard.rb
@@ -7,7 +7,7 @@ class Wizard < ::DFEWizard::Base
     self.steps = [
       Steps::PersonalDetails,
       Steps::MatchbackFailed,
-      ::Wizard::Steps::Authenticate,
+      ::DFEWizard::Steps::Authenticate,
       Steps::Callback,
       Steps::TalkingPoints,
       Steps::PrivacyPolicy,

diff --git a/app/models/events/wizard.rb b/app/models/events/wizard.rb
@@ -6,7 +6,7 @@ class Wizard < ::DFEWizard::Base
 
     self.steps = [
       Steps::PersonalDetails,
-      ::Wizard::Steps::Authenticate,
+      ::DFEWizard::Steps::Authenticate,
       Steps::ContactDetails,
       Steps::FurtherDetails,
       Steps::PersonalisedUpdates,

diff --git a/app/models/mailing_list/wizard.rb b/app/models/mailing_list/wizard.rb
@@ -6,7 +6,7 @@ class Wizard < ::DFEWizard::Base
 
     self.steps = [
       Steps::Name,
-      ::Wizard::Steps::Authenticate,
+      ::DFEWizard::Steps::Authenticate,
       Steps::AlreadySubscribed,
       Steps::DegreeStatus,
       Steps::TeacherTraining,

diff --git a/app/models/wizard/steps/authenticate.rb b/app/models/wizard/steps/authenticate.rb
diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -288,13 +288,6 @@ en:
             subject:
               blank: Select a subject
 
-        wizard/steps/authenticate:
-          attributes:
-            timed_one_time_password:
-              blank: Enter the verification code sent to your email address
-              invalid: The verification code should be 6 digits
-              wrong_code: Please enter the latest verification code sent to your email address
-
         events/search:
           attributes:
             type:

diff --git a/spec/models/callbacks/wizard_spec.rb b/spec/models/callbacks/wizard_spec.rb
@@ -23,7 +23,7 @@
       is_expected.to eql [
         Callbacks::Steps::PersonalDetails,
         Callbacks::Steps::MatchbackFailed,
-        ::Wizard::Steps::Authenticate,
+        ::DFEWizard::Steps::Authenticate,
         Callbacks::Steps::Callback,
         Callbacks::Steps::TalkingPoints,
         Callbacks::Steps::PrivacyPolicy,

diff --git a/spec/models/events/wizard_spec.rb b/spec/models/events/wizard_spec.rb
@@ -20,7 +20,7 @@
     it do
       is_expected.to eql [
         Events::Steps::PersonalDetails,
-        ::Wizard::Steps::Authenticate,
+        ::DFEWizard::Steps::Authenticate,
         Events::Steps::ContactDetails,
         Events::Steps::FurtherDetails,
         Events::Steps::PersonalisedUpdates,

diff --git a/spec/models/mailing_list/wizard_spec.rb b/spec/models/mailing_list/wizard_spec.rb
@@ -19,7 +19,7 @@
     it do
       is_expected.to eql [
         MailingList::Steps::Name,
-        ::Wizard::Steps::Authenticate,
+        ::DFEWizard::Steps::Authenticate,
         MailingList::Steps::AlreadySubscribed,
         MailingList::Steps::DegreeStatus,
         MailingList::Steps::TeacherTraining,

diff --git a/spec/models/wizard/steps/authenticate_spec.rb b/spec/models/wizard/steps/authenticate_spec.rb
diff --git a/spec/requests/event_steps_controller_spec.rb b/spec/requests/event_steps_controller_spec.rb
@@ -147,7 +147,7 @@ def perform_request
           allow_any_instance_of(Events::Steps::PersonalDetails).to \
             receive(:valid?).and_return true
 
-          allow_any_instance_of(Wizard::Steps::Authenticate).to \
+          allow_any_instance_of(::DFEWizard::Steps::Authenticate).to \
             receive(:valid?).and_return true
 
           allow_any_instance_of(Events::Steps::ContactDetails).to \