Merge pull request NuGet#2183 from NuGet/anurse/2181-silenterroronema…

…ilconflict Fix NuGet#2181 by correcting the ModelError key name
OmniFinancial · Jun 2, 2014 · 172ba7e · 172ba7e
2 parents 82a50e8 + f467ff0
commit 172ba7e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/NuGetGallery/Controllers/UsersController.cs b/src/NuGetGallery/Controllers/UsersController.cs
@@ -316,7 +316,7 @@ public virtual async Task<ActionResult> ChangeEmail(AccountViewModel model)
             }
             catch (EntityException e)
             {
-                ModelState.AddModelError("NewEmail", e.Message);
+                ModelState.AddModelError("ChangeEmail.NewEmail", e.Message);
                 return AccountView(model);
             }
 

diff --git a/tests/NuGetGallery.Facts/Controllers/UsersControllerFacts.cs b/tests/NuGetGallery.Facts/Controllers/UsersControllerFacts.cs
@@ -534,7 +534,7 @@ public async Task DoesNotLetYouUseSomeoneElsesConfirmedEmailAddress()
                         }
                     });
                 Assert.False(controller.ModelState.IsValid);
-                Assert.Equal("msg", controller.ModelState["NewEmail"].Errors[0].ErrorMessage);
+                Assert.Equal("msg", controller.ModelState["ChangeEmail.NewEmail"].Errors[0].ErrorMessage);
             }
 
             [Fact]
-Original file line number
+Diff line change
@@ Expand Up @@
                             }
                         });
                     Assert.False(controller.ModelState.IsValid);
-                    Assert.Equal("msg", controller.ModelState["NewEmail"].Errors[0].ErrorMessage);
+                    Assert.Equal("msg", controller.ModelState["ChangeEmail.NewEmail"].Errors[0].ErrorMessage);
                 }
                 [Fact]
@@ Expand Down @@