fix: failing tests

Fix failing tests and move other_reason into member params and give param name more description

Author: davidmillen50

app/controllers/concerns/member_concerns.rb

@@ -18,7 +18,7 @@ def member_params
         :about_you,
         :skill_list,
         :newsletter,
-        :other_reason,
+        :how_you_found_us_other_reason,
         how_you_found_us: []
       )
     end

app/controllers/member/details_controller.rb

@@ -13,30 +13,20 @@ def edit
   end
 
   def update
-    attrs = member_params.to_h
+    how_found = Array(params.dig(:member, :how_you_found_us)).reject(&:blank?)
+    other_reason = params.dig(:member, :how_you_found_us_other_reason)
 
-    if attrs[:how_you_found_us].blank?
-      @member.assign_attributes(attrs)
+    how_found << other_reason if other_reason.present?
+    how_found.uniq!
+
+    if how_found.blank?
+      @member.assign_attributes(member_params.to_h.except(:how_you_found_us_other_reason))
       @member.errors.add(:how_you_found_us, 'You must select at least one option')
       return render :edit
     end
 
-    how_found = params.dig(:member, :how_you_found_us)
-    attrs[:how_you_found_us] =
-      if how_found.is_a?(Array)
-        how_found
-      elsif how_found.blank?
-        []
-      else
-        [how_found]
-      end
-
-    if params[:other_reason].present?
-      attrs[:how_you_found_us] << params[:other_reason]
-    end
-
-    attrs[:how_you_found_us].uniq!
-    attrs[:how_you_found_us].reject!(&:blank?)
+    attrs = member_params.to_h.except(:how_you_found_us_other_reason)
+    attrs[:how_you_found_us] = how_found
 
     return render :edit unless @member.update(attrs)
 

app/views/member/details/edit.html.haml

@@ -25,8 +25,8 @@
             .form-check
               = check_box_tag 'member[how_you_found_us][]', option, false, id: "how_you_found_us_#{option.parameterize}", class: 'form-check-input'
               = label_tag "how_you_found_us_#{option.parameterize}", option, class: 'form-check-label', style: 'margin-left: 8px;'
-          = label_tag :other_reason, t('member.details.edit.other_reason'), class: 'my-1'
-          = text_field_tag :other_reason, nil, placeholder: "Please specify how you heard about us", class: 'form-control w-100;'
+          = label_tag :how_you_found_us_other_reason, t('member.details.edit.how_you_found_us_other_reason'), class: 'my-1'
+          = text_field_tag 'member[how_you_found_us_other_reason]', nil, placeholder: "Please specify how you heard about us", class: 'form-control w-100'
         = f.input :newsletter, as: :boolean, checked_value: true, unchecked_value: false
         .text-right.mb-4
           = hidden_field_tag :next_page, step2_member_path(member_type: @type)

config/locales/en.yml

@@ -443,7 +443,7 @@ en:
         title: Almost there...
         summary: We need some more details from you to finish creating your account. We use these to help run our events.
         how_you_found_us: "How did you find out about us?"
-        other_reason: "Please specify (if Other)"
+        how_you_found_us_other_reason: "Please specify (if Other)"
         coach:
           about_you: What experience do you have? What languages do you like to use? Tell us a little bit about yourself!
         student:

spec/controllers/member/details_controller_spec.rb

@@ -27,13 +27,13 @@
           id: member.id,
           member: {
             how_you_found_us: ['Search engine (Google etc.)'],
+            how_you_found_us_other_reason: 'Saw a pamphlet',
             newsletter: 'false'
           },
-          other_reason: 'Saw a flyer'
         }
 
         member.reload
-        expect(member.how_you_found_us).to contain_exactly('Search engine (Google etc.)', 'Saw a flyer')
+        expect(member.how_you_found_us).to contain_exactly('Search engine (Google etc.)', 'Saw a pamphlet')
         expect(response).to redirect_to(step2_member_path)
       end
 
@@ -42,9 +42,9 @@
           id: member.id,
           member: {
             how_you_found_us: [],
+            how_you_found_us_other_reason: 'At a meetup',
             newsletter: 'true'
           },
-          other_reason: 'At a meetup'
         }
 
         member.reload
@@ -57,9 +57,9 @@
           id: member.id,
           member: {
             how_you_found_us: ['From a friend', '', 'From a friend'],
+            how_you_found_us_other_reason: 'From a friend',
             newsletter: 'true'
           },
-          other_reason: 'From a friend'
         }
 
         member.reload

spec/features/member_joining_spec.rb

@@ -42,7 +42,7 @@
     fill_in 'member_email', with: '[email protected]'
     fill_in 'member_about_you', with: Faker::Lorem.paragraph
     find('#how_you_found_us_from-a-friend').click
-    fill_in 'other_reason', with: 'found on a poster', id: true
+    fill_in 'member_how_you_found_us_other_reason', with: 'found on a poster', id: true
     click_on 'Next'
 
     expect(page).to have_current_path(step2_member_path)

spec/features/subscribing_to_newsletter_spec.rb

@@ -27,6 +27,8 @@
       fill_in 'member_surname', with: 'Doe'
       fill_in 'member_email', with: '[email protected]'
       fill_in 'member_about_you', with: Faker::Lorem.paragraph
+      find('#how_you_found_us_from-a-friend').click
+      fill_in 'member_how_you_found_us_other_reason', with: Faker::Lorem.paragraph, id: true
 
       click_on 'Next'
     end
@@ -46,6 +48,8 @@
       fill_in 'member_surname', with: 'Doe'
       fill_in 'member_email', with: '[email protected]'
       fill_in 'member_about_you', with: Faker::Lorem.paragraph
+      find('#how_you_found_us_from-a-friend').click
+      fill_in 'member_how_you_found_us_other_reason', with: Faker::Lorem.paragraph, id: true
 
       uncheck 'newsletter'
 

spec/models/member_spec.rb

@@ -15,28 +15,6 @@
         it { expect(member).to validate_presence_of(:email) }
         it { expect(member).to validate_presence_of(:about_you) }
       end
-
-
-      context 'how_you_found_us validation' do
-        let(:new_member) { Fabricate(:member) }
-        it 'is invalid if how_you_found_us is nil' do
-          new_member.how_you_found_us = nil
-          new_member.valid?
-          expect(new_member.errors[:how_you_found_us]).to include("You must select at least one option")
-        end
-
-        it 'is invalid if how_you_found_us is an empty array' do
-          new_member.how_you_found_us = []
-          new_member.valid?
-          expect(new_member.errors[:how_you_found_us]).to include("You must select at least one option")
-        end
-
-        it 'is valid if how_you_found_us has at least one non-blank option' do
-          new_member.how_you_found_us = ['From a friend']
-          new_member.valid?
-          expect(new_member.errors[:how_you_found_us]).to be_empty
-        end
-      end
     end
 
     describe 'properties' do