diff options
| author | Manish Sinha <manish.sinha@xamarin.com> | 2015-06-10 00:36:22 +0300 |
|---|---|---|
| committer | Manish Sinha <manish.sinha@xamarin.com> | 2015-06-10 00:36:22 +0300 |
| commit | 8b0d0756dbd73c55e4e553bb9334e474808b1e37 (patch) | |
| tree | 54ee8e7e3f2285e758b1c32f57d415f38bb3721c /main/tests/UserInterfaceTests/VersionControlTests | |
| parent | ff0c4d71cf8e74615453e938c462083a28380c4f (diff) | |
[UITest] Git: Fix situation where XS email is empty and there is a conflict
Diffstat (limited to 'main/tests/UserInterfaceTests/VersionControlTests')
| -rw-r--r-- | main/tests/UserInterfaceTests/VersionControlTests/VCSBase.cs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/main/tests/UserInterfaceTests/VersionControlTests/VCSBase.cs b/main/tests/UserInterfaceTests/VersionControlTests/VCSBase.cs index 73ef45f57a..cf599626fd 100644 --- a/main/tests/UserInterfaceTests/VersionControlTests/VCSBase.cs +++ b/main/tests/UserInterfaceTests/VersionControlTests/VCSBase.cs @@ -101,19 +101,20 @@ namespace UserInterfaceTests protected void EnterGitUserConfig (string gitUser, string gitEmail) { + Session.ToggleElement (c => c.Window ().Marked ("MonoDevelop.VersionControl.Git.UserGitConfigDialog").Children ().CheckButton ().Marked ("repoConfigRadio"), true); + Session.EnterText (c => c.Window ().Marked ("MonoDevelop.VersionControl.Git.UserGitConfigDialog").Children ().Textfield ().Marked ("usernameEntry"), gitUser); Session.WaitForElement (c => c.Window ().Marked ("MonoDevelop.VersionControl.Git.UserGitConfigDialog").Children ().Textfield ().Marked ("usernameEntry").Text (gitUser)); Session.EnterText (c => c.Window ().Marked ("MonoDevelop.VersionControl.Git.UserGitConfigDialog").Children ().Textfield ().Marked ("emailEntry"), gitEmail); Session.WaitForElement (c => c.Window ().Marked ("MonoDevelop.VersionControl.Git.UserGitConfigDialog").Children ().Textfield ().Marked ("emailEntry").Text (gitEmail)); - Session.ToggleElement (c => c.Window ().Marked ("MonoDevelop.VersionControl.Git.UserGitConfigDialog").Children ().CheckButton ().Marked ("globalConfigRadio"), true); - TakeScreenShot ("Git-User-Email-Filled"); Session.ClickElement (c => c.Window ().Marked ("MonoDevelop.VersionControl.Git.UserGitConfigDialog").Children ().Button ().Marked ("buttonOk")); if (Session.Query (c => c.Window ().Marked ("MonoDevelop.VersionControl.Git.UserInfoConflictDialog")).Length > 0) { TakeScreenShot ("Provided-User-Details-Mismatch"); - Session.ToggleElement (c => c.Window ().Marked ("MonoDevelop.VersionControl.Git.UserGitConfigDialog").Children ().CheckButton ().Marked ("radiobutton2"), true); + Session.ToggleElement (c => c.Window ().Marked ("MonoDevelop.VersionControl.Git.UserInfoConflictDialog").Children ().CheckButton ().Marked ("radiobutton2"), true); + TakeScreenShot ("Selected-Use-Git-Config"); Session.ClickElement (c => c.Window ().Marked ("MonoDevelop.VersionControl.Git.UserInfoConflictDialog").Children ().Button ().Marked ("buttonOk")); } } |