Merge branch 'master' of https://github.com/coderrapp/codeRR.Server

jgauffin · jgauffin · commit f7124ebb9ae5 · 2018-01-22T14:50:16.000+01:00
diff --git a/src/Server/Coderr.Server.SqlServer.Tests/Helpers/TestDataManager.cs b/src/Server/Coderr.Server.SqlServer.Tests/Helpers/TestDataManager.cs
@@ -109,6 +109,26 @@ public void CreateUserAndApplication(out int accountId, out int applicationId)
             }
         }
 
+        public void CreateUser(TestUser testUser, int applicationId)
+        {
+            using (var uow = CreateUnitOfWork())
+            {
+                var accountRepos = new AccountRepository(uow);
+                var account = new Account(testUser.Username, testUser.Password) { Email = testUser.Email };
+                account.Activate();
+                accountRepos.Create(account);
+                var userRepos = new UserRepository(uow);
+                var user = new User(account.Id, testUser.Username) { EmailAddress = testUser.Email };
+                userRepos.CreateAsync(user).GetAwaiter().GetResult();
+
+                var appRepos = new ApplicationRepository(uow);
+                var member = new ApplicationTeamMember(applicationId, account.Id, "Admin");
+                appRepos.CreateAsync(member).GetAwaiter().GetResult();
+
+                uow.SaveChanges();
+            }
+        }
+
         private void EnsureServerSettings(string baseUrl)
         {
             using (var con = _connectionFactory())
diff --git a/src/Server/Coderr.Server.Web.Tests/Helpers/Extensions/WebDriverExtensions.cs b/src/Server/Coderr.Server.Web.Tests/Helpers/Extensions/WebDriverExtensions.cs
@@ -1,38 +1,11 @@
 ﻿using System;
 using OpenQA.Selenium;
 using OpenQA.Selenium.Support.UI;
-using Xunit.Sdk;
 
 namespace codeRR.Server.Web.Tests.Helpers.Extensions
 {
     public static class WebDriverExtensions
     {
-        public static bool ElementIsPresent(this IWebDriver driver, By by)
-        {
-            var present = false;
-            try
-            {
-                present = driver.FindElement(by).Displayed;
-            }
-            catch (NoSuchElementException)
-            {
-            }
-            return present;
-        }
-
-        public static bool ElementIsPresent(this IWebDriver driver, IWebElement element)
-        {
-            var present = false;
-            try
-            {
-                present = element.Displayed;
-            }
-            catch (NoSuchElementException)
-            {
-            }
-            return present;
-        }
-
         public static bool WaitUntilElementIsPresent(this IWebDriver driver, By by, int timeout = 5)
         {
             var wait = new WebDriverWait(driver, TimeSpan.FromSeconds(timeout));
@@ -59,5 +32,31 @@ public static string WaitUntilTitleEquals(this IWebDriver driver, string title,
 
             return driver.Title;
         }
+
+        private static bool ElementIsPresent(this IWebDriver driver, By by)
+        {
+            var present = false;
+            try
+            {
+                present = driver.FindElement(by).Displayed;
+            }
+            catch (NoSuchElementException)
+            {
+            }
+            return present;
+        }
+
+        private static bool ElementIsPresent(this IWebDriver driver, IWebElement element)
+        {
+            var present = false;
+            try
+            {
+                present = element.Displayed;
+            }
+            catch (NoSuchElementException)
+            {
+            }
+            return present;
+        }
     }
 }
diff --git a/src/Server/Coderr.Server.Web.Tests/Pages/Account/ActivationRequestedPage.cs b/src/Server/Coderr.Server.Web.Tests/Pages/Account/ActivationRequestedPage.cs
@@ -5,7 +5,7 @@ namespace codeRR.Server.Web.Tests.Pages.Account
 {
     public class ActivationRequestedPage : BasePage
     {
-        public ActivationRequestedPage(IWebDriver webDriver) : base(webDriver, (string) "Account/ActivationRequested", (string) "Account registered - codeRR")
+        public ActivationRequestedPage(IWebDriver webDriver) : base(webDriver, "Account/ActivationRequested", "Account registered - codeRR")
         {
         }
 
diff --git a/src/Server/Coderr.Server.Web.Tests/Pages/Account/LoginPage.cs b/src/Server/Coderr.Server.Web.Tests/Pages/Account/LoginPage.cs
@@ -6,7 +6,7 @@ namespace codeRR.Server.Web.Tests.Pages.Account
 {
     public class LoginPage : BasePage
     {
-        public LoginPage(IWebDriver webDriver) : base(webDriver, (string) "Account/Login", (string) "Login - codeRR")
+        public LoginPage(IWebDriver webDriver) : base(webDriver, "Account/Login", "Login - codeRR")
         {
         }
 
@@ -19,19 +19,19 @@ public LoginPage(IWebDriver webDriver) : base(webDriver, (string) "Account/Login
         [FindsBy(How = How.Id, Using = "Password")]
         public IWebElement PasswordField { get; set; }
 
-        public HomePage LoginWithValidCredentials()
+        public IPage LoginWithValidCredentials(string userName, string password)
         {
             NavigateToPage();
 
             UserNameField.Clear();
-            UserNameField.SendKeys(TestUser.Username);
+            UserNameField.SendKeys(userName);
 
             PasswordField.Clear();
-            PasswordField.SendKeys(TestUser.Password);
+            PasswordField.SendKeys(password);
 
             SignInButton.Click();
 
-            return new HomePage(WebDriver);
+            return PageHelper.ResolvePage(WebDriver);
         }
 
         public LoginPage LoginWithNonExistingUserWithoutPasswordSpecified()
diff --git a/src/Server/Coderr.Server.Web.Tests/Pages/Account/LogoutPage.cs b/src/Server/Coderr.Server.Web.Tests/Pages/Account/LogoutPage.cs
@@ -4,7 +4,7 @@ namespace codeRR.Server.Web.Tests.Pages.Account
 {
     public class LogoutPage : BasePage
     {
-        public LogoutPage(IWebDriver webDriver) : base(webDriver, (string) "Account/Logout", (string) "")
+        public LogoutPage(IWebDriver webDriver) : base(webDriver, "Account/Logout", "")
         {
         }
 
diff --git a/src/Server/Coderr.Server.Web.Tests/Pages/Account/RegisterPage.cs b/src/Server/Coderr.Server.Web.Tests/Pages/Account/RegisterPage.cs
@@ -7,7 +7,7 @@ namespace codeRR.Server.Web.Tests.Pages.Account
 {
     public class RegisterPage : BasePage
     {
-        public RegisterPage(IWebDriver webDriver) : base(webDriver, (string) "Account/Register", (string) "Register account - codeRR")
+        public RegisterPage(IWebDriver webDriver) : base(webDriver, "Account/Register", "Register account - codeRR")
         {
         }
 
diff --git a/src/Server/Coderr.Server.Web.Tests/Pages/ApplicationPage.cs b/src/Server/Coderr.Server.Web.Tests/Pages/ApplicationPage.cs
@@ -0,0 +1,29 @@
+﻿using OpenQA.Selenium;
+using OpenQA.Selenium.Support.PageObjects;
+using OpenQA.Selenium.Support.UI;
+
+namespace codeRR.Server.Web.Tests.Pages
+{
+    public class ApplicationPage : BasePage
+    {
+        public ApplicationPage(IWebDriver webDriver, int id) : base(webDriver, "#/application/{id}", "")
+        {
+            Url = Url.Replace("{id}", id.ToString());
+        }
+
+        [FindsBy(How = How.Id, Using = "pageTitle")]
+        public IWebElement PageTitle { get; set; }
+
+        public void VerifyIsCurrentPage()
+        {
+            Wait.Until(ExpectedConditions.TitleIs(Title));
+        }
+
+        public void VerifyIncidentReported()
+        {
+            var by = By.PartialLinkText("Value cannot be null");
+            //var element = WebDriver.FindElement(by);
+            Wait.Until(ExpectedConditions.ElementExists(by));
+        }
+    }
+}
diff --git a/src/Server/Coderr.Server.Web.Tests/Pages/BasePage.cs b/src/Server/Coderr.Server.Web.Tests/Pages/BasePage.cs
@@ -6,12 +6,12 @@
 
 namespace codeRR.Server.Web.Tests.Pages
 {
-    public class BasePage
+    public class BasePage : IPage
     {
         protected IWebDriver WebDriver;
         protected WebDriverWait Wait;
         protected string BaseUrl { get; }
-        protected string Url { get; set; }
+        public string Url { get; set; }
         public string Title { get; }
 
         protected readonly TestUser TestUser = WebTest.TestUser;
diff --git a/src/Server/Coderr.Server.Web.Tests/Pages/IPage.cs b/src/Server/Coderr.Server.Web.Tests/Pages/IPage.cs
@@ -0,0 +1,8 @@
+﻿namespace codeRR.Server.Web.Tests.Pages
+{
+    public interface IPage
+    {
+        string Url { get; set; }
+        string Title { get; }
+    }
+}
diff --git a/src/Server/Coderr.Server.Web.Tests/Pages/PageHelper.cs b/src/Server/Coderr.Server.Web.Tests/Pages/PageHelper.cs
@@ -0,0 +1,25 @@
+﻿using System;
+using System.Text.RegularExpressions;
+using codeRR.Server.Web.Tests.Pages.Account;
+using OpenQA.Selenium;
+
+namespace codeRR.Server.Web.Tests.Pages
+{
+    public class PageHelper
+    {
+        public static IPage ResolvePage(IWebDriver webDriver)
+        {
+            var match = Regex.Match(webDriver.Url, @"/#/$", RegexOptions.IgnoreCase);
+            if (match.Success)
+                return new HomePage(webDriver);
+            match = Regex.Match(webDriver.Url, @"/Account/Login", RegexOptions.IgnoreCase);
+            if (match.Success)
+                return new LoginPage(webDriver);
+            match = Regex.Match(webDriver.Url, @"/#/application/(\d+)", RegexOptions.IgnoreCase);
+            if(match.Success)
+                return new ApplicationPage(webDriver, Convert.ToInt16(match.Groups[1].Value));
+
+            throw new ArgumentOutOfRangeException($"Url: {webDriver.Url}, Title: {webDriver.Title}");
+        }
+    }
+}
diff --git a/src/Server/Coderr.Server.Web.Tests/Tests/AdminUserTests.cs b/src/Server/Coderr.Server.Web.Tests/Tests/AdminUserTests.cs
@@ -0,0 +1,35 @@
+﻿using System;
+using codeRR.Server.Web.Tests.Helpers.Extensions;
+using codeRR.Server.Web.Tests.Pages;
+using OpenQA.Selenium;
+using Xunit;
+
+namespace codeRR.Server.Web.Tests.Tests
+{
+    [Trait("Category", "Integration")]
+    public class AdminUserTests : LoggedInTest, IDisposable
+    {
+        private readonly IPage _homePage;
+
+        public AdminUserTests()
+        {
+            _homePage = Login();
+        }
+
+        [Fact]
+        public void Admin_Should_have_create_new_application_menu_item()
+        {
+            UITest(() =>
+            {
+                Assert.IsType<HomePage>(_homePage);
+                Assert.Equal("Overview", WebDriver.WaitUntilTitleEquals(_homePage.Title));
+                Assert.NotNull(WebDriver.FindElement(By.XPath("//a/span[.='Create new application']")));
+            });
+        }
+        
+        public void Dispose()
+        {
+            Logout();
+        }
+    }
+}
diff --git a/src/Server/Coderr.Server.Web.Tests/Tests/ConfigureApplicationPageTests.cs b/src/Server/Coderr.Server.Web.Tests/Tests/ConfigureApplicationPageTests.cs
@@ -1,25 +1,27 @@
-﻿using codeRR.Server.Web.Tests.Pages;
+﻿using System;
+using codeRR.Server.Web.Tests.Pages;
 using Xunit;
 
 namespace codeRR.Server.Web.Tests.Tests
 {
     [Trait("Category", "Integration")]
-    public class ConfigureApplicationPageTests : LoggedInTest
+    public class ConfigureApplicationPageTests : LoggedInTest, IDisposable
     {
+        public ConfigureApplicationPageTests()
+        {
+            Login();
+        }
+
         [Fact]
         public void Should_not_be_able_to_create_application_without_name_specified()
         {
             UITest(() =>
             {
-                Login();
-
                 var sut = new ConfigureApplicationPage(WebDriver)
                     .CreateApplication(string.Empty);
 
                 //TODO: Verify error message
                 sut.VerifyIsCurrentPage();
-
-                Logout();
             });
         }
 
@@ -28,8 +30,6 @@ public void Should_be_able_to_create_application()
         {
             UITest(() =>
             {
-                Login();
-
                 var applicationName = "TestApplication";
 
                 var sut = new ConfigureApplicationPage(WebDriver)
@@ -42,9 +42,12 @@ public void Should_be_able_to_create_application()
                 homePage.VerifyIsCurrentPage();
 
                 homePage.HasApplicationInNavigation(applicationName);
-
-                Logout();
             });
         }
+
+        public void Dispose()
+        {
+            Logout();
+        }
     }
 }
diff --git a/src/Server/Coderr.Server.Web.Tests/Tests/HomePageTests.cs b/src/Server/Coderr.Server.Web.Tests/Tests/HomePageTests.cs
@@ -1,27 +1,34 @@
-﻿using codeRR.Server.Web.Tests.Pages;
+﻿using System;
+using codeRR.Server.Web.Tests.Pages;
 using Xunit;
 
 namespace codeRR.Server.Web.Tests.Tests
 {
     [Trait("Category", "Integration")]
-    public class HomePageTests : LoggedInTest
+    public class HomePageTests : LoggedInTest, IDisposable
     {
+        public HomePageTests()
+        {
+            Login();
+        }
+
         [Fact]
         public void Should_be_able_to_navigate_to_myfirstapp_application()
         {
             UITest(() =>
             {
-                Login();
-
                 var sut = new HomePage(WebDriver);
                 sut.NavigateToPage();
 
                 sut.NavigationMyTestApp.Click();
 
                 sut.VerifyNavigatedToMyTestApp();
-
-                Logout();
             });
         }
+
+        public void Dispose()
+        {
+            Logout();
+        }
     }
 }
diff --git a/src/Server/Coderr.Server.Web.Tests/Tests/IncidentsPageTests.cs b/src/Server/Coderr.Server.Web.Tests/Tests/IncidentsPageTests.cs
diff --git a/src/Server/Coderr.Server.Web.Tests/Tests/LoggedInTest.cs b/src/Server/Coderr.Server.Web.Tests/Tests/LoggedInTest.cs
diff --git a/src/Server/Coderr.Server.Web.Tests/Tests/LoginPageTests.cs b/src/Server/Coderr.Server.Web.Tests/Tests/LoginPageTests.cs
diff --git a/src/Server/Coderr.Server.Web.Tests/Tests/UserTests.cs b/src/Server/Coderr.Server.Web.Tests/Tests/UserTests.cs
diff --git a/src/Server/Coderr.Server.Web.Tests/codeRR.Server.Web.Tests.csproj b/src/Server/Coderr.Server.Web.Tests/codeRR.Server.Web.Tests.csproj

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ namespace codeRR.Server.Web.Tests.Pages.Account`
`5`	`5`	`{`
`6`	`6`	`public class ActivationRequestedPage : BasePage`
`7`	`7`	`{`
`8`		`- public ActivationRequestedPage(IWebDriver webDriver) : base(webDriver, (string) "Account/ActivationRequested", (string) "Account registered - codeRR")`
	`8`	`+ public ActivationRequestedPage(IWebDriver webDriver) : base(webDriver, "Account/ActivationRequested", "Account registered - codeRR")`
`9`	`9`	`{`
`10`	`10`	`}`
`11`	`11`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ namespace codeRR.Server.Web.Tests.Pages.Account`
`6`	`6`	`{`
`7`	`7`	`public class LoginPage : BasePage`
`8`	`8`	`{`
`9`		`- public LoginPage(IWebDriver webDriver) : base(webDriver, (string) "Account/Login", (string) "Login - codeRR")`
	`9`	`+ public LoginPage(IWebDriver webDriver) : base(webDriver, "Account/Login", "Login - codeRR")`
`10`	`10`	`{`
`11`	`11`	`}`
`12`	`12`
`@@ -19,19 +19,19 @@ public LoginPage(IWebDriver webDriver) : base(webDriver, (string) "Account/Login`
`19`	`19`	`[FindsBy(How = How.Id, Using = "Password")]`
`20`	`20`	`public IWebElement PasswordField { get; set; }`
`21`	`21`
`22`		`- public HomePage LoginWithValidCredentials()`
	`22`	`+ public IPage LoginWithValidCredentials(string userName, string password)`
`23`	`23`	`{`
`24`	`24`	`NavigateToPage();`
`25`	`25`
`26`	`26`	`UserNameField.Clear();`
`27`		`- UserNameField.SendKeys(TestUser.Username);`
	`27`	`+ UserNameField.SendKeys(userName);`
`28`	`28`
`29`	`29`	`PasswordField.Clear();`
`30`		`- PasswordField.SendKeys(TestUser.Password);`
	`30`	`+ PasswordField.SendKeys(password);`
`31`	`31`
`32`	`32`	`SignInButton.Click();`
`33`	`33`
`34`		`- return new HomePage(WebDriver);`
	`34`	`+ return PageHelper.ResolvePage(WebDriver);`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`public LoginPage LoginWithNonExistingUserWithoutPasswordSpecified()`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ namespace codeRR.Server.Web.Tests.Pages.Account`
`4`	`4`	`{`
`5`	`5`	`public class LogoutPage : BasePage`
`6`	`6`	`{`
`7`		`- public LogoutPage(IWebDriver webDriver) : base(webDriver, (string) "Account/Logout", (string) "")`
	`7`	`+ public LogoutPage(IWebDriver webDriver) : base(webDriver, "Account/Logout", "")`
`8`	`8`	`{`
`9`	`9`	`}`
`10`	`10`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ namespace codeRR.Server.Web.Tests.Pages.Account`
`7`	`7`	`{`
`8`	`8`	`public class RegisterPage : BasePage`
`9`	`9`	`{`
`10`		`- public RegisterPage(IWebDriver webDriver) : base(webDriver, (string) "Account/Register", (string) "Register account - codeRR")`
	`10`	`+ public RegisterPage(IWebDriver webDriver) : base(webDriver, "Account/Register", "Register account - codeRR")`
`11`	`11`	`{`
`12`	`12`	`}`
`13`	`13`
Original file line number	Diff line number	Diff line change
`@@ -6,12 +6,12 @@`
`6`	`6`
`7`	`7`	`namespace codeRR.Server.Web.Tests.Pages`
`8`	`8`	`{`
`9`		`- public class BasePage`
	`9`	`+ public class BasePage : IPage`
`10`	`10`	`{`
`11`	`11`	`protected IWebDriver WebDriver;`
`12`	`12`	`protected WebDriverWait Wait;`
`13`	`13`	`protected string BaseUrl { get; }`
`14`		`- protected string Url { get; set; }`
	`14`	`+ public string Url { get; set; }`
`15`	`15`	`public string Title { get; }`
`16`	`16`
`17`	`17`	`protected readonly TestUser TestUser = WebTest.TestUser;`