libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases Packages Activity Actions

Replace ChromeJavascriptBrowser annotation with JavascriptBrowser (#20535)

Browse source
This commit is contained in:
Jon Koops 2023-05-24 13:23:15 +02:00 committed by GitHub
parent 1f5d3223ae
commit 90d2a01619
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/ChromeJavascriptBrowser.java
View file

@ -1,34 +0,0 @@
/*
* Copyright 2023 Red Hat, Inc. and/or its affiliates
* and other contributors as indicated by the @author tags.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.keycloak.testsuite.util;
import org.jboss.arquillian.drone.api.annotation.Qualifier;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
/**
*
* @author <a href="mailto:mabartos@redhat.com">Martin Bartos</a>
*/
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.FIELD, ElementType.PARAMETER})
@Qualifier
public @interface ChromeJavascriptBrowser {
}

10
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/cors/CorsExampleAdapterTest.java
View file

@ -32,7 +32,7 @@ import org.keycloak.testsuite.adapter.AbstractExampleAdapterTest;
import org.keycloak.testsuite.adapter.page.AngularCorsProductTestApp;
import org.keycloak.testsuite.adapter.page.CorsDatabaseServiceTestApp;
import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
import org.keycloak.testsuite.util.ChromeJavascriptBrowser;
import org.keycloak.testsuite.util.JavascriptBrowser;
import org.keycloak.testsuite.utils.arquillian.ContainerConstants;
import org.keycloak.testsuite.auth.page.account.Account;
import org.keycloak.testsuite.auth.page.login.OIDCLogin;
@ -75,19 +75,19 @@ public class CorsExampleAdapterTest extends AbstractExampleAdapterTest {
// Javascript browser needed, but not PhantomJS
@Drone
@ChromeJavascriptBrowser
@JavascriptBrowser
protected WebDriver jsDriver;
@Page
@ChromeJavascriptBrowser
@JavascriptBrowser
protected OIDCLogin jsDriverTestRealmLoginPage;
@Page
@ChromeJavascriptBrowser
@JavascriptBrowser
private AngularCorsProductTestApp jsDriverAngularCorsProductPage;
@Page
@ChromeJavascriptBrowser
@JavascriptBrowser
private Account jsDriverTestRealmAccount;
@Deployment(name = AngularCorsProductTestApp.DEPLOYMENT_NAME, managed = false)

7
testsuite/integration-arquillian/tests/base/src/test/resources/arquillian.xml
View file

@ -98,13 +98,6 @@
<property name="downloadBinaries">${webdriverDownloadBinaries}</property>
</extension>
<extension qualifier="webdriver-chromejavascriptbrowser">
<property name="browser">chrome</property>
<property name="chromeBinary">${chromeBinary}</property>
<property name="chromeArguments">${js.chromeArguments}</property>
<property name="chromeDriverVersion">${chromeDriverVersion}</property>
</extension>
<extension qualifier="graphene-secondbrowser">
<property name="browser">${browser}</property>
<property name="firefoxBinary">${firefox_binary}</property>