FIX: update user preferences was failing if custom_fields is blank st…

…ring

app/services/user_updater.rb

@@ -66,7 +66,7 @@ def update(attributes = {})
       user_profile.send("#{attribute}=", attributes[attribute])
     end
 
-    if fields = attributes[:custom_fields]
+    if fields = attributes[:custom_fields] and fields.present?
       user.custom_fields = fields
     end
 

spec/services/user_updater_spec.rb

@@ -91,5 +91,17 @@
         expect(user.reload.user_profile.website).to eq 'http://example.com'
       end
     end
+
+    context 'when custom_fields is empty string' do
+      it "update is successful" do
+        user = Fabricate(:user)
+        user.custom_fields = {'import_username' => 'my_old_username'}
+        user.save
+        updater = described_class.new(acting_user, user)
+
+        updater.update(website: 'example.com', custom_fields: '')
+        user.reload.custom_fields.should == {'import_username' => 'my_old_username'}
+      end
+    end
   end
 end