Commits

Vineet Reynolds committed 0170ba3

Updating Arquillian-GlassFish containers to 1.0.0.CR3.
Also corrected the tests to ensure that they succeed on Firefox 10.0.2.

Comments (0)

Files changed (5)

galleria-jsf/pom.xml

 	<description>The web module containing JSF facelets and managed beans.</description>
 	<properties>
 		<arquillian.version>1.0.0.CR7</arquillian.version>
-		<arquillian.glassfish-remote.version>1.0.0.CR1</arquillian.glassfish-remote.version>
+		<arquillian.glassfish-remote.version>1.0.0.CR3</arquillian.glassfish-remote.version>
 		<arquillian.drone.version>1.0.0.CR3</arquillian.drone.version>
 		<arquillian.jacoco.version>1.0.0.Alpha1</arquillian.jacoco.version>
 		<selenium.version>2.15.0</selenium.version>

galleria-jsf/src/test/java/info/galleria/view/AllPagesIntegrationTest.java

 
 	private static final int PORT = 6300;
 	
-	private static final String webAppDeploymentName = "galleria-jsf";
-
 	@Rule
 	public TestName testMethod = new TestName();
 
 	protected WebDriver driver;
 
 	@ArquillianResource
-	protected URI deploymentPath;
-	
 	protected URI contextPath;
 
 	@Deployment(testable=false)
 		System.out.println(ejbArchive.toString(true));
 
 		WebArchive webArchive = ShrinkWrap
-				.create(WebArchive.class, webAppDeploymentName + ".war")
+				.create(WebArchive.class, "foo-galleria-jsf.war") // Ensure that this is not "galleria-jsf.war", for now
 				.setWebXML(new File("src/main/webapp/WEB-INF/web.xml"))
 				.addPackage("info.galleria.converters")
 				.addPackage("info.galleria.filters")
 	public void setUp() throws Exception
 	{
 		logger.info("Performing setup before Test {}", testMethod.getMethodName());
-		contextPath = new URI(deploymentPath.toString() + "/" + webAppDeploymentName + "/");
 		IDatabaseConnection connection = null;
 		try
 		{

galleria-jsf/src/test/java/info/galleria/view/album/ViewAlbumPage.java

 			WebElement description = element.findElement(By.className("description"));
 			if (name.getText().equals(photoTitle) && description.getText().equals(photoDescription))
 			{
-				element.findElement(By.className("photolink")).click();
+				element.findElement(By.tagName("a")).click();
 				return new ViewPhotoPage(driver, contextPath);
 			}
 		}

galleria-jsf/src/test/java/info/galleria/view/user/HomePage.java

 			WebElement description = element.findElement(By.className("description"));
 			if (name.getText().equals(albumName) && description.getText().equals(albumDescription))
 			{
-				element.findElement(By.className("photolink")).click();
+				element.findElement(By.tagName("a")).click();
 				return new ViewAlbumPage(driver, contextPath);
 			}
 		}

galleria-jsf/src/test/resources/arquillian.xml

 	<!-- Remote Glassfish configuration -->
 	<container qualifier="glassfish" default="true">
 		<configuration>
-			<property name="remoteServerAdminPort">10048</property>
-			<property name="remoteServerHttpPort">10080</property>
+			<property name="adminPort">10048</property>
 		</configuration>
 	</container>
 	<!-- Firefox Driver configuration -->