Flow decorators (#1052)

* cleanup flow decorators and next step paths

* remove conditional signup link

* upgrade openstax_salesforce

* fix school name

* update complete profile handler spec

* fix redirect back code

* update env.sample

Author: mwvolo

.env.example

@@ -2,6 +2,8 @@
 # This may or may not be a complete listing, but they are very useful ones.
 #####
 
+ENVIRONMENT_NAME=local
+
 # Especially useful for debugging, learning our codebase, or development.
 # — Whether it should take screenshots during features specs or not (see `screenshot!`)
 SSHOTS=false

Gemfile.lock

@@ -176,7 +176,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.1.10)
     crack (0.4.5)
       rexml
     crass (1.0.6)
@@ -372,7 +372,7 @@ GEM
       activesupport (>= 4)
       railties (>= 4)
       request_store (~> 1.0)
-    loofah (2.14.0)
+    loofah (2.15.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     lumberjack (1.0.10)
@@ -459,7 +459,7 @@ GEM
       rails (>= 3.0)
     openstax_rescue_from (4.2.0)
       rails (>= 3.1, < 7.0)
-    openstax_salesforce (7.4.2)
+    openstax_salesforce (7.4.3)
       openstax_active_force
       rails (>= 5.0, < 7.0)
       restforce
@@ -582,7 +582,7 @@ GEM
     responders (3.0.1)
       actionpack (>= 5.0)
       railties (>= 5.0)
-    restforce (5.2.3)
+    restforce (5.2.4)
       faraday (>= 0.9.0, < 1.9.0)
       faraday_middleware (>= 0.8.8, <= 2.0)
       hashie (>= 1.2.0, < 6.0)

app/handlers/newflow/educator_signup/complete_profile.rb

@@ -56,15 +56,15 @@ def handle
         @is_on_cs_form = signup_params.is_cs_form?
         outputs.is_on_cs_form = @is_on_cs_form
 
+        # is this user coming from the sheerid flow? there are a few things we can check...
+        @did_use_sheerid = !(signup_params.is_school_not_supported_by_sheerid == 'true' ||
+          signup_params.is_country_not_supported_by_sheerid == 'true' ||
+          user.is_sheerid_unviable? || @is_on_cs_form)
+
         # validate the form
         check_params
         return if errors?
 
-        # is this user coming from the sheerid flow? there are a few things we can check...
-        @did_use_sheerid = !(signup_params.is_school_not_supported_by_sheerid == 'true' ||
-                             signup_params.is_country_not_supported_by_sheerid == 'true' ||
-                             user.is_sheerid_unviable? || @is_on_cs_form)
-
         @user.update!(
           role: signup_params.educator_specific_role,
           other_role_name: other_role_name,
@@ -144,7 +144,7 @@ def books_of_interest
       def check_params
         role = signup_params.educator_specific_role.strip.downcase
 
-        if !@did_use_sheerid && signup_params.school_name.nil?
+        if signup_params.school_name && signup_params.school_name.nil?
           param_error(:school_name, :school_name_must_be_entered)
         end
 

app/views/newflow/educator_signup/_school_name.html.erb

@@ -7,7 +7,7 @@
       <%= I18n.t(:"educator_profile_form.school_name_must_be_entered") %>
     </div>
     <input
-      name="<%= :school_name %>"
+      name="signup[school_name]"
       placeholder="<%= I18n.t(:"educator_profile_form.school_name") %>"
       autofocus
       data-bind="textInput: schoolName"

app/views/newflow/signup/welcome.html.erb

@@ -1,7 +1,3 @@
-<%
-    conditional_educator_signup_path = Settings::FeatureFlags.educator_feature_flag ? educator_signup_path : signup_path(set_param_to_permit_legacy_flow)
-%>
-
 <div id="login-signup-form">
     <div class="content">
         <%= render partial: 'newflow/tab_group', locals: { active_class: 'signup--active'} %>
@@ -36,7 +32,7 @@
                         </div>
 
                         <div>
-                            <%= link_to conditional_educator_signup_path, data: { 'ga-category': 'Account Creation', 'ga-action': 'Click', 'ga-label': '2B-Educator' } do %>
+                            <%= link_to educator_signup_path, data: { 'ga-category': 'Account Creation', 'ga-action': 'Click', 'ga-label': '2B-Educator' } do %>
                                 <div class="join-as__role educator">
                                     <span><%= I18n.t(:"login_signup_form.educator") %></span>
                                     <%= image_tag('educator-icon.svg') %>

lib/educator_signup_flow_decorator.rb

@@ -10,27 +10,25 @@ def initialize(user, current_step)
   end
 
   def newflow_edu_incomplete_step_3?
-    if !user.is_newflow? || user.is_sheerid_unviable?
+    if user.is_sheerid_unviable?
       return false
     elsif user.sheerid_verification_id.blank? && user.pending_faculty? && !user.is_educator_pending_cs_verification
       return true
     end
   end
 
   def newflow_edu_incomplete_step_4?
-    return false if !user.is_newflow?
-
     return true if !user.is_profile_complete?
   end
 
   def can_do?(action)
-    return false if shouldnt_proceed?
+    return false if user.student?
 
     case action
     when 'redirect_back_upon_login'
-      !user.is_newflow? || (user.is_newflow? && user.is_profile_complete?)
+      user.is_profile_complete?
     when 'educator_sheerid_form'
-      (user.no_faculty_info? || user.pending_faculty?) && user.sheerid_verification_id.blank?
+      (user.no_faculty_info? || user.pending_faculty? || user.incomplete_signup?) && user.sheerid_verification_id.blank?
     when 'educator_signup_form'
       user.is_anonymous?
     when 'educator_signup'
@@ -64,11 +62,4 @@ def next_step
       raise("Next step (#{current_step}) uncaught in #{self.class.name}")
     end
   end
-
-  private ###################
-
-  def shouldnt_proceed?
-    user.student? || !Settings::FeatureFlags.educator_feature_flag
-  end
-
 end

spec/handlers/newflow/educator_signup/complete_profile_spec.rb

@@ -32,8 +32,8 @@ module EducatorSignup
 
           it "should return correct error" do
             result = handle
-            expect(result.errors.count).to eq 2
-            expect(result.errors.first.message).to eq 'Please enter school name'
+            expect(result.errors.count).to eq 1
+            expect(result.errors.first.message).to eq 'Please enter other role name'
           end
         end
 
@@ -44,8 +44,8 @@ module EducatorSignup
 
           it "should return correct error" do
             result = handle
-            expect(result.errors.count).to eq 2
-            expect(result.errors.first.message).to eq 'Please enter school name'
+            expect(result.errors.count).to eq 1
+            expect(result.errors.first.message).to eq 'Please enter books used'
           end
         end
 
@@ -55,8 +55,8 @@ module EducatorSignup
 
           it "should return correct error" do
             result = handle
-            expect(result.errors.count).to eq 2
-            expect(result.errors.first.message).to eq 'Please enter school name'
+            expect(result.errors.count).to eq 1
+            expect(result.errors.first.message).to eq 'Please enter number of students taught'
           end
         end
       end