Rebase following changes to allow walk ins to skip verification

DFE-Digital · Oct 20, 2021 · e144077 · e144077
1 parent 1f3624e
commit e144077
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 7 deletions.
diff --git a/Gemfile b/Gemfile
@@ -81,7 +81,7 @@ gem "actionpack-cloudfront", ">= 1.1.0"
 # HTML-aware ERB parsing
 gem "better_html"
 
-gem "dfe_wizard", github: "DFE-Digital/dfe_wizard", branch: "move-extra-controller-code"
+gem "dfe_wizard", github: "DFE-Digital/dfe_wizard"
 
 group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,6 @@
 GIT
   remote: https://github.com/DFE-Digital/dfe_wizard.git
-  revision: 3b8fb44c760a0e342d89ed7a4824733a224646b0
-  branch: move-extra-controller-code
+  revision: 27c34d9ba46ee963668a39e9e69bc67496740481
   specs:
     dfe_wizard (0.1.0)
       activemodel (>= 6.0.3.4)

diff --git a/app/models/events/wizard.rb b/app/models/events/wizard.rb
@@ -13,7 +13,7 @@ class Wizard < ::DFEWizard::Base
     ].freeze
 
     def matchback_attributes
-      %i[candidate_id qualification_id].freeze
+      %i[candidate_id qualification_id is_verified].freeze
     end
 
     def complete!

diff --git a/spec/models/events/wizard_spec.rb b/spec/models/events/wizard_spec.rb
@@ -30,7 +30,7 @@
 
   describe "#matchback_attributes" do
     it do
-      expect(subject.matchback_attributes).to match_array(%i[candidate_id qualification_id])
+      expect(subject.matchback_attributes).to match_array(%i[candidate_id qualification_id is_verified])
     end
   end
 
@@ -94,7 +94,7 @@
       before { wizardstore[:is_walk_in] = false }
 
       it "raises an exception" do
-        expect { subject.exchange_unverified_request(request) }.to raise_error(Wizard::ContinueUnverifiedNotSupportedError)
+        expect { subject.exchange_unverified_request(request) }.to raise_error(DFEWizard::ContinueUnverifiedNotSupportedError)
       end
     end
 

diff --git a/spec/requests/event_steps_controller_spec.rb b/spec/requests/event_steps_controller_spec.rb
@@ -84,7 +84,7 @@ def perform_request
     before do
       allow_any_instance_of(Events::Steps::PersonalDetails).to \
         receive(:is_walk_in?).and_return(true)
-      allow_any_instance_of(Wizard::Steps::Authenticate).to \
+      allow_any_instance_of(DFEWizard::Steps::Authenticate).to \
         receive(:candidate_identity_data) { camelized_identity_data }
     end