Skip to content

Globally set all browsers to tear down after each test #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jleeh merged 2 commits into from
Aug 25, 2015
Merged

Globally set all browsers to tear down after each test #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ad37d6
Firefox/IE only clears cookie and not sessions on reset, tear-down an…
jleeh Aug 25, 2015
905e63d
Globally set all browsers to tear down and be instantiated after ever…
jleeh Aug 25, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 6 additions & 14 deletions src/main/java/com/frameworkium/config/DriverType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,13 @@
import org.apache.logging.log4j.Logger;
import org.openqa.selenium.WebDriver;
import org.openqa.selenium.remote.DesiredCapabilities;
import org.openqa.selenium.remote.SessionNotFoundException;

import static com.frameworkium.config.SystemProperty.*;
import static com.frameworkium.config.DriverSetup.useRemoteDriver;
import static com.frameworkium.config.SystemProperty.*;

public abstract class DriverType {

private WebDriverWrapper webDriverWrapper;
protected WebDriverWrapper webDriverWrapper;

protected final static Logger logger = LogManager.getLogger(DriverType.class);

Expand Down Expand Up @@ -74,19 +73,12 @@ public void tearDownDriver() {
}

/**
* Reset the browser session based on whether it's been reset before
* Reset the browser based on whether it's been reset before
*/
public boolean clearSession(boolean requiresReset) {
public boolean resetBrowser(boolean requiresReset) {
if (requiresReset) {
try {
if (DriverType.isNative()) {
webDriverWrapper.getWrappedAppiumDriver().resetApp();
} else {
webDriverWrapper.manage().deleteAllCookies();
}
} catch (SessionNotFoundException e) {
logger.error("Session quit unexpectedly.", e);
}
tearDownDriver();
instantiate();
}
return true;
}
Expand Down
1 change: 0 additions & 1 deletion src/main/java/com/frameworkium/config/drivers/FirefoxImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,4 @@ public DesiredCapabilities getDesiredCapabilities() {
public WebDriver getWebDriverObject(DesiredCapabilities capabilities) {
return new FirefoxDriver(capabilities);
}

}
1 change: 0 additions & 1 deletion src/main/java/com/frameworkium/config/drivers/InternetExporerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,4 @@ public DesiredCapabilities getDesiredCapabilities() {
public WebDriver getWebDriverObject(DesiredCapabilities capabilities) {
return new InternetExplorerDriver(capabilities);
}

}
34 changes: 15 additions & 19 deletions src/main/java/com/frameworkium/tests/internal/BaseTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,32 +1,28 @@
package com.frameworkium.tests.internal;

import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.List;

import com.frameworkium.capture.ScreenshotCapture;
import com.frameworkium.config.DriverSetup;
import com.frameworkium.config.DriverType;
import com.frameworkium.config.WebDriverWrapper;
import com.frameworkium.listeners.*;
import com.frameworkium.reporting.AllureProperties;
import com.saucelabs.common.SauceOnDemandAuthentication;
import com.saucelabs.common.SauceOnDemandSessionIdProvider;
import com.saucelabs.testng.SauceOnDemandAuthenticationProvider;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.openqa.selenium.JavascriptExecutor;
import org.openqa.selenium.remote.SessionId;
import org.testng.annotations.*;

import org.testng.annotations.AfterSuite;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.BeforeSuite;
import org.testng.annotations.Listeners;
import ru.yandex.qatools.allure.annotations.Issue;
import ru.yandex.qatools.allure.annotations.TestCaseId;

import com.frameworkium.capture.ScreenshotCapture;
import com.frameworkium.config.WebDriverWrapper;
import com.frameworkium.listeners.CaptureListener;
import com.frameworkium.listeners.MethodInterceptor;
import com.frameworkium.listeners.ResultLoggerListener;
import com.frameworkium.listeners.SauceLabsListener;
import com.frameworkium.listeners.ScreenshotListener;
import com.frameworkium.listeners.TestListener;
import com.frameworkium.reporting.AllureProperties;
import com.saucelabs.common.SauceOnDemandAuthentication;
import com.saucelabs.common.SauceOnDemandSessionIdProvider;
import com.saucelabs.testng.SauceOnDemandAuthenticationProvider;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.List;

@Listeners({CaptureListener.class, ScreenshotListener.class, MethodInterceptor.class, SauceLabsListener.class,
TestListener.class, ResultLoggerListener.class})
Expand Down Expand Up @@ -120,7 +116,7 @@ private static void initialiseNewScreenshotCapture(Method testMethod) {
* Ran as part of the initialiseDriverObject, configures parts of the driver
*/
private static void configureDriverBasedOnParams() {
requiresReset.set(driverType.get().clearSession(requiresReset.get()));
requiresReset.set(driverType.get().resetBrowser(requiresReset.get()));
driverType.get().maximiseBrowserWindow();
setUserAgent();
}
Expand Down