user sees error if partially completing postal address field

Author: lilwillifo

app/models/user.rb

@@ -74,7 +74,7 @@ def student
   validates :name, :email, :country, :location, presence: true, unless: :github_import
 
   accepts_nested_attributes_for :roles, allow_destroy: true
-  accepts_nested_attributes_for :postal_address, allow_destroy: true, reject_if: :postal_address_rejectable?
+  accepts_nested_attributes_for :postal_address, allow_destroy: true, reject_if: :all_blank
 
   def postal_address_rejectable?(attr)
     attr['address_line_1'].blank? || attr['city'].blank? || attr['postal_code'].blank? || attr['country'].blank?

app/views/users/edit.html.slim

@@ -109,7 +109,7 @@
   = f.input :tshirt_cut, as: :select, collection: User::TSHIRT_CUTS.map { |s| [s, s] }, label: 'T-Shirt cut', include_blank: true
   h4 Shipping Address
   - if @user.postal_address
-     = link_to "Remove Address", user_path(@user, user: { postal_address_attributes: { id: @user.postal_address.id, "_destroy" => true }}), method: :put, data: { confirm: 'You sure?' }
+     = link_to "Remove Address", user_path(@user, user: { postal_address_attributes: { id: @user.postal_address.id, "_destroy" => true }}), method: :put, data: { confirm: 'Are you sure?' }
   = f.simple_fields_for :postal_address_attributes, @user.postal_address do |pa|
     = pa.input :address_line_1, required: false
     = pa.input :address_line_2, required: false

spec/features/users/postal_address_spec.rb

@@ -30,13 +30,13 @@
       end
 
       it 'does not allow a postal address to be added if required fields are missing' do
+        expect(user.postal_address).to be_nil
         fill_in 'user[postal_address_attributes][address_line_1]',    with: address.address_line_1
         fill_in 'user[postal_address_attributes][postal_code]',       with: address.postal_code
         click_on 'Save'
 
-        expect(current_path).to eq edit_user_path(user)
-
-        expect(page).to have_content "If adding a shipping address, please include all required fields."
+        expect(page).to have_content "Postal address city can't be blank"
+        expect(page).to have_content "Postal address country can't be blank"
       end
 
       it 'autofills saved postal address info on edit form if it exists' do