forked from wakaleo/game-of-life
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Moved web tests into a separate module.
- Loading branch information
Showing
19 changed files
with
212 additions
and
127 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,4 +13,5 @@ target | |
| *.iws | ||
| *.versionsBackup | ||
|
|
||
| *.iml | ||
| *.iml | ||
| .DS_Store | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...e/web/controllers/HomePageController.java → ...tests/controllers/HomePageController.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...web/controllers/WhenCreatingANewGame.java → ...sts/controllers/WhenCreatingANewGame.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...ontrollers/WhenDisplayingTheHomePage.java → ...ontrollers/WhenDisplayingTheHomePage.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...ntrollers/WhenSpawningANewGeneration.java → ...ntrollers/WhenSpawningANewGeneration.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,177 @@ | ||
| <?xml version="1.0"?> | ||
| <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" | ||
| xmlns="http://maven.apache.org/POM/4.0.0" | ||
| xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
| <parent> | ||
| <artifactId>gameoflife</artifactId> | ||
| <groupId>com.wakaleo.gameoflife</groupId> | ||
| <version>0.7.49-SNAPSHOT</version> | ||
| </parent> | ||
| <artifactId>gameoflife-webtests</artifactId> | ||
| <name>gameoflife-webtests</name> | ||
| <properties> | ||
| <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> | ||
| <jetty.port>9090</jetty.port> | ||
| <jetty.stop.port>9999</jetty.stop.port> | ||
| <webdriver.base.url>http://localhost:${jetty.port}</webdriver.base.url> | ||
| </properties> | ||
| <dependencies> | ||
| <dependency> | ||
| <groupId>org.easytesting</groupId> | ||
| <artifactId>fest-assert</artifactId> | ||
| <version>1.4</version> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>net.thucydides</groupId> | ||
| <artifactId>thucydides-core</artifactId> | ||
| <version>${thucydides.version}</version> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>net.thucydides</groupId> | ||
| <artifactId>thucydides-junit</artifactId> | ||
| <version>${thucydides.version}</version> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>net.thucydides.easyb</groupId> | ||
| <artifactId>thucydides-easyb-plugin</artifactId> | ||
| <version>${thucydides.version}</version> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>com.googlecode.lambdaj</groupId> | ||
| <artifactId>lambdaj</artifactId> | ||
| <version>2.3.1</version> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.codehaus.groovy</groupId> | ||
| <artifactId>groovy-all</artifactId> | ||
| <version>1.8.2</version> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.slf4j</groupId> | ||
| <artifactId>slf4j-simple</artifactId> | ||
| <version>1.6.1</version> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.slf4j</groupId> | ||
| <artifactId>slf4j-api</artifactId> | ||
| <version>1.6.1</version> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>com.wakaleo.gameoflife</groupId> | ||
| <artifactId>gameoflife-web</artifactId> | ||
| <version>${project.version}</version> | ||
| <type>war</type> | ||
| </dependency> | ||
| </dependencies> | ||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <artifactId>maven-surefire-plugin</artifactId> | ||
| <version>2.9</version> | ||
| <configuration> | ||
| <skip>true</skip> | ||
| </configuration> | ||
| <executions> | ||
| <execution> | ||
| <id>unit-tests</id> | ||
| <phase>test</phase> | ||
| <goals> | ||
| <goal>test</goal> | ||
| </goals> | ||
| <configuration> | ||
| <skip>false</skip> | ||
| <parallel>classes</parallel> | ||
| <excludes> | ||
| <exclude>**/webtests/*.java</exclude> | ||
| </excludes> | ||
| </configuration> | ||
| </execution> | ||
| <execution> | ||
| <id>integration-tests</id> | ||
| <phase>integration-test</phase> | ||
| <goals> | ||
| <goal>test</goal> | ||
| </goals> | ||
| <configuration> | ||
| <skip>false</skip> | ||
| <parallel>classes</parallel> | ||
| <includes> | ||
| <include>**/webtests/*.java</include> | ||
| </includes> | ||
| <excludes> | ||
| <exclude>**/pages/*.java</exclude> | ||
| </excludes> | ||
| <systemPropertyVariables> | ||
| <webdriver.base.url>${webdriver.base.url}</webdriver.base.url> | ||
| </systemPropertyVariables> | ||
| </configuration> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
| <profiles> | ||
| <profile> | ||
| <id>integration-tests</id> | ||
| <activation> | ||
| <activeByDefault>true</activeByDefault> | ||
| </activation> | ||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.codehaus.cargo</groupId> | ||
| <artifactId>cargo-maven2-plugin</artifactId> | ||
| <version>1.1.3</version> | ||
| <executions> | ||
| <execution> | ||
| <id>start-container</id> | ||
| <phase>pre-integration-test</phase> | ||
| <goals> | ||
| <goal>start</goal> | ||
| </goals> | ||
| </execution> | ||
| <execution> | ||
| <id>stop-container</id> | ||
| <phase>post-integration-test</phase> | ||
| <goals> | ||
| <goal>stop</goal> | ||
| </goals> | ||
| </execution> | ||
| </executions> | ||
| <configuration> | ||
| <container> | ||
| <containerId>jetty7x</containerId> | ||
| <type>embedded</type> | ||
| </container> | ||
| <configuration> | ||
| <type>standalone</type> | ||
| <deployables> | ||
| <deployable> | ||
| <groupId>com.wakaleo.gameoflife</groupId> | ||
| <artifactId>gameoflife-web</artifactId> | ||
| <type>war</type> | ||
| <properties> | ||
| <context>/</context> | ||
| </properties> | ||
| </deployable> | ||
| </deployables> | ||
| <properties> | ||
| <cargo.servlet.port>${jetty.port}</cargo.servlet.port> | ||
| </properties> | ||
| </configuration> | ||
| </configuration> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
| </profile> | ||
| </profiles> | ||
| </project> |
6 changes: 3 additions & 3 deletions
6
...tests/WhenTheUserEntersAnInitialGrid.java → ...tests/WhenTheUserEntersAnInitialGrid.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.