{{loggedIn.username}}
-@{{loggedIn.username}}
+@{{loggedIn.username}}
{{loggedIn.website}}{{ address }}
{{loggedIn.email}}
@@ -102,7 +102,7 @@Who to follow
RefreshVie
- {{f.username}}
+ {{f.username}}
@{{f.username}}
diff --git a/login_screenshot.png b/login_screenshot.png
new file mode 100644
index 0000000..fbc8812
Binary files /dev/null and b/login_screenshot.png differ
diff --git a/login_success_screenshot.png b/login_success_screenshot.png
new file mode 100644
index 0000000..4117033
Binary files /dev/null and b/login_success_screenshot.png differ
diff --git a/pom.xml b/pom.xml
index 038c67f..4331aab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,7 @@
Hi You!
How are you doing?
", "text/html; charset=utf-8"); - - Transport.send(message); - } -} diff --git a/src/main/test/com/nscharrenberg/kwetter/integration/PermissionTest.java b/src/main/test/com/nscharrenberg/kwetter/integration/PermissionTest.java deleted file mode 100644 index 451e550..0000000 --- a/src/main/test/com/nscharrenberg/kwetter/integration/PermissionTest.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.nscharrenberg.kwetter.integration; - -import com.github.tomakehurst.wiremock.client.WireMock; -import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; -import static com.github.tomakehurst.wiremock.client.WireMock.containing; -import static com.github.tomakehurst.wiremock.client.WireMock.post; -import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo; -import com.jayway.restassured.RestAssured; -import static com.jayway.restassured.RestAssured.given; -import com.jayway.restassured.http.ContentType; -import com.jayway.restassured.parsing.Parser; -import java.io.File; -import java.net.URL; -import org.hamcrest.Matchers; -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; -import org.jboss.arquillian.junit.InSequence; -import org.jboss.arquillian.test.api.ArquillianResource; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.resolver.api.maven.Maven; -import org.junit.Test; -import org.junit.runner.RunWith; - -@RunWith(Arquillian.class) -public class PermissionTest { - private final WireMock wiremock = new WireMock(8888); - - @Deployment(testable = false) - public static WebArchive createDeployment() { - File[] files = Maven.resolver() - .loadPomFromFile("pom.xml") - .importRuntimeDependencies() - .resolve() - .withTransitivity() - .asFile(); - return ShrinkWrap.create(WebArchive.class) - .addPackages(true, "com.nscharrenberg.kwetter") - .addAsWebInfResource(new File("src/main/resources/META-INF/beans.xml")) - .addAsLibraries(files); - } - - @ArquillianResource - private URL contextPath; - - @Test - @InSequence(1) - public void testGetUsers() { - RestAssured.registerParser("text/plain", Parser.TEXT); - given() - .when() - .get(contextPath.toString() + "api/users") - .then() - .statusCode(200) - .contentType(ContentType.JSON); - } -} diff --git a/src/main/test/com/nscharrenberg/kwetter/selenium/setups/LoginPage.java b/src/main/test/com/nscharrenberg/kwetter/selenium/setups/LoginPage.java new file mode 100644 index 0000000..a5a0b56 --- /dev/null +++ b/src/main/test/com/nscharrenberg/kwetter/selenium/setups/LoginPage.java @@ -0,0 +1,38 @@ +package com.nscharrenberg.kwetter.selenium.setups; + +import org.openqa.selenium.By; +import org.openqa.selenium.WebDriver; +import org.openqa.selenium.WebElement; +import org.openqa.selenium.support.ui.ExpectedConditions; +import org.openqa.selenium.support.ui.WebDriverWait; + +public class LoginPage { + private static final String USERNAME_FIELD = "username"; + private static final String PASSWORD_FIELD = "password"; + private static final String LOGIN_BUTTON_FIELD = "loginBtn"; + private static final int TIMEOUT_SECONDS = 20; + + public String login(WebDriver driver, String username, String password) { + WebDriverWait wait = new WebDriverWait(driver, TIMEOUT_SECONDS); + + // Set Username Field + WebElement usernameElement = wait.until(ExpectedConditions.elementToBeClickable(By.id(USERNAME_FIELD))); + usernameElement.sendKeys(username); + + WebElement passwordElement = wait.until(ExpectedConditions.elementToBeClickable(By.id(PASSWORD_FIELD))); + passwordElement.sendKeys(password); + + WebElement loginButtonElement = wait.until(ExpectedConditions.elementToBeClickable(By.id(LOGIN_BUTTON_FIELD))); + loginButtonElement.click(); + +// WebElement loginPage = wait.until(ExpectedConditions.presenceOfElementLocated(By.id("usernameTag"))); +// wait.until(ExpectedConditions.or( +// ExpectedConditions.presenceOfElementLocated(By.id("usernameTag")), +// ExpectedConditions.presenceOfElementLocated(By.className("alert-danger")) +// )); + + WebElement loginPage =wait.until(ExpectedConditions.presenceOfElementLocated(By.xpath("//*[contains(@id,'usernameTag') or (contains(@class,'alert-danger'))]"))); + + return loginPage.getText(); + } +} diff --git a/src/main/test/com/nscharrenberg/kwetter/selenium/tests/LoginSeleniumTests.java b/src/main/test/com/nscharrenberg/kwetter/selenium/tests/LoginSeleniumTests.java new file mode 100644 index 0000000..6171c5a --- /dev/null +++ b/src/main/test/com/nscharrenberg/kwetter/selenium/tests/LoginSeleniumTests.java @@ -0,0 +1,41 @@ +package com.nscharrenberg.kwetter.selenium.tests; + +import com.nscharrenberg.kwetter.selenium.setups.LoginPage; +import com.nscharrenberg.kwetter.selenium.utils.SeleniumTestBase; +import org.junit.Test; + +import java.io.IOException; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotEquals; + +public class LoginSeleniumTests extends SeleniumTestBase { + private LoginPage loginPage = new LoginPage(); + + @Test + public void login_valid_user() throws IOException { + String loginUrl = WEBSITE_HOST + "auth/login"; + String username = "admin"; + String password = "password123"; + + webDriver.get(loginUrl); + screenshotHelper.saveScreenshot("login_for_success_test_screenshot.png"); + String nextPage = loginPage.login(webDriver, username, password); + screenshotHelper.saveScreenshot("login_success_screenshot.png"); + assertEquals("@" + username, nextPage); + } + + @Test + public void login_invalid_user() throws IOException { + String loginUrl = WEBSITE_HOST + "auth/login"; + String username = "admin123"; + String password = "wrongpassword"; + + webDriver.get(loginUrl); + screenshotHelper.saveScreenshot("login_for_failed_test_screenshot.png"); + String nextPage = loginPage.login(webDriver, username, password); + screenshotHelper.saveScreenshot("login_invalid_screenshot.png"); + assertNotEquals("@" + username, nextPage); + assertEquals("Wrong username or password", nextPage); + } +} diff --git a/src/main/test/com/nscharrenberg/kwetter/selenium/utils/ScreenshotHelper.java b/src/main/test/com/nscharrenberg/kwetter/selenium/utils/ScreenshotHelper.java new file mode 100644 index 0000000..f2abc51 --- /dev/null +++ b/src/main/test/com/nscharrenberg/kwetter/selenium/utils/ScreenshotHelper.java @@ -0,0 +1,23 @@ +package com.nscharrenberg.kwetter.selenium.utils; + +import org.apache.commons.io.FileUtils; +import org.openqa.selenium.OutputType; +import org.openqa.selenium.TakesScreenshot; +import org.openqa.selenium.WebDriver; + +import java.io.File; +import java.io.IOException; + +public class ScreenshotHelper { + private WebDriver webDriver; + + public ScreenshotHelper(WebDriver webDriver) { + super(); + this.webDriver = webDriver; + } + + public void saveScreenshot(String screenshotFileName) throws IOException { + File screenshot = ((TakesScreenshot) webDriver).getScreenshotAs(OutputType.FILE); + FileUtils.copyFile(screenshot, new File("tests_results/" + screenshotFileName)); + } +} diff --git a/src/main/test/com/nscharrenberg/kwetter/selenium/utils/SeleniumTestBase.java b/src/main/test/com/nscharrenberg/kwetter/selenium/utils/SeleniumTestBase.java new file mode 100644 index 0000000..e29ffeb --- /dev/null +++ b/src/main/test/com/nscharrenberg/kwetter/selenium/utils/SeleniumTestBase.java @@ -0,0 +1,40 @@ +package com.nscharrenberg.kwetter.selenium.utils; + +import org.junit.After; +import org.junit.Before; +import org.openqa.selenium.WebDriver; +import org.openqa.selenium.chrome.ChromeDriver; +import org.openqa.selenium.chrome.ChromeOptions; + +import java.io.IOException; + +public class SeleniumTestBase { + protected static final String WEBSITE_HOST = "http://localhost:4200/"; + + protected WebDriver webDriver; + protected ScreenshotHelper screenshotHelper; + + public SeleniumTestBase() { + super(); + } + + @Before + public void setup() { + String projectLocation = System.getProperty("user.dir"); + System.setProperty("webdriver.chrome.driver", projectLocation + "\\selenium\\chromedriver.exe"); + + ChromeOptions options = new ChromeOptions(); + options.addArguments("--incognito"); + + webDriver = new ChromeDriver(options); + screenshotHelper = new ScreenshotHelper(webDriver); + + // Maximize Window + webDriver.manage().window().maximize(); + } + + @After + public void close() throws IOException { + webDriver.close(); + } +} diff --git a/target/kwetter/WEB-INF/web.xml b/target/kwetter/WEB-INF/web.xml index 5e2a871..e85d745 100644 --- a/target/kwetter/WEB-INF/web.xml +++ b/target/kwetter/WEB-INF/web.xml @@ -61,7 +61,6 @@