You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by hn...@apache.org on 2018/05/25 07:40:14 UTC

[myfaces-tobago] branch master updated: Update FAQ, cleanup pom, improve comment

This is an automated email from the ASF dual-hosted git repository.

hnoeth pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git


The following commit(s) were added to refs/heads/master by this push:
     new 2011856  Update FAQ, cleanup pom, improve comment
2011856 is described below

commit 20118566b013eecee27a899f1c9e28083e268140
Author: Henning Noeth <hn...@apache.org>
AuthorDate: Fri May 25 09:40:06 2018 +0200

    Update FAQ, cleanup pom, improve comment
    
    * update integration test section in FAQ
    * remove qunit-integration-tests profile from pom
    * add description how to start docker containers in SingelPageTest
---
 tobago-example/tobago-example-demo/pom.xml         | 53 ---------------
 .../main/webapp/content/10-intro/70-faq/faq.xhtml  | 75 +++++++++++-----------
 .../tobago/example/demo/qunit/StandardTest.java    |  1 +
 3 files changed, 37 insertions(+), 92 deletions(-)

diff --git a/tobago-example/tobago-example-demo/pom.xml b/tobago-example/tobago-example-demo/pom.xml
index 55f7fd1..94ba60a 100644
--- a/tobago-example/tobago-example-demo/pom.xml
+++ b/tobago-example/tobago-example-demo/pom.xml
@@ -930,59 +930,6 @@
     </profile>
 
     <profile>
-      <id>qunit-integration-tests</id>
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-failsafe-plugin</artifactId>
-            <configuration>
-              <includes>
-                <include>**/QUnitTests.java</include>
-              </includes>
-              <forkMode>never</forkMode>
-            </configuration>
-            <executions>
-              <execution>
-                <goals>
-                  <goal>integration-test</goal>
-                  <goal>verify</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-      <dependencies>
-        <dependency>
-          <groupId>org.apache.tomee</groupId>
-          <artifactId>apache-tomee</artifactId>
-          <version>${tomee.version}</version>
-          <classifier>webprofile</classifier>
-          <type>zip</type>
-          <scope>test</scope>
-          <exclusions>
-            <exclusion>
-              <groupId>org.slf4j</groupId>
-              <artifactId>slf4j-jdk14</artifactId>
-            </exclusion>
-          </exclusions>
-        </dependency>
-        <dependency>
-          <groupId>org.apache.tomee</groupId>
-          <artifactId>arquillian-tomee-remote</artifactId>
-          <version>${tomee.version}</version>
-          <scope>test</scope>
-          <exclusions>
-            <exclusion>
-              <groupId>org.slf4j</groupId>
-              <artifactId>slf4j-jdk14</artifactId>
-            </exclusion>
-          </exclusions>
-        </dependency>
-      </dependencies>
-    </profile>
-
-    <profile>
       <id>checkstyle-for-view-definition-language</id>
       <build>
         <plugins>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/70-faq/faq.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/70-faq/faq.xhtml
index f1b0355..d2aa878 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/70-faq/faq.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/70-faq/faq.xhtml
@@ -311,45 +311,42 @@
         SUBST X: "C:\Dokumente und Einstellungen\MyUser\Apache Projects\"</code></pre>
   </tc:section>
 
-  <tc:section id="seleniumTobago12" label="How can I run the Selenium tests? (Tobago 1 and 2)">
-    <p>
-      In the tobago-example-test application, the pages can be checked with selenium since Tobago 1.5.
-      To run the full test automatically call
-    </p>
-    <pre><code class="language-markup">
-          mvn -P integration-test</code></pre>
-    <p>
-      This will start a jetty server and a selenium server and calls every listed page in the test application.
-    </p>
-
-    <p>
-      If you want to run the tests from your IDE, please start the jetty with
-      <code class="language-markup">
-        mvn jetty:run</code> or <code class="language-markup">mvn jetty:run-exploded</code>
-      and start the selenium server with
-    </p>
-    <pre><code class="language-markup">
-          mvn selenium:start-server</code></pre>
-    <p>
-      Now you can start the selenium tests in the IDE.
-    </p>
-    <p>
-      Sometimes there is a problem with Firefox. You may try to use a different version, or an installation without
-      plugins.
-    </p>
-  </tc:section>
-
-  <tc:section id="integrationTestTobago3" label="How can I run the integration tests? (Tobago 3)">
-    <p>In the tobago-example-demo application, the pages can be checked with QUnit/Arquillian.
-      To run the full test automatically call
-    </p>
-    <pre><code class="language-markup">cd tobago-example/tobago-example-demo
-          mvn verify -Pqunit-integration-tests</code></pre>
-    <p>
-      The default arquillian browser is 'phantomjs'.
-      You can change it in tobago-example-demo/pom.xml &lt;arquillian.browser>.</p>
-    <p>If you want to run the tests from your IDE, please use the maven profile 'tomee'.
-      After that, you can start the test from the QUnitTests class.</p>
+  <tc:section id="integrationTest" label="How can I run the integration tests?">
+    <tc:section id="seleniumTobago12" label="Tobago 1 and 2">
+      <p>In the tobago-example-test application, the pages can be checked with selenium since Tobago 1.5.
+        To run the full test automatically call</p>
+      <pre><code class="language-markup">mvn -P integration-test</code></pre>
+      <p>This will start a jetty server and a selenium server and calls every listed page in the test application.</p>
+      <p>If you want to run the tests from your IDE, please start the jetty with
+        <code class="language-markup">mvn jetty:run</code> or
+        <code class="language-markup">mvn jetty:run-exploded</code>
+        and start the selenium server with</p>
+      <pre><code class="language-markup">mvn selenium:start-server</code></pre>
+      <p>Now you can start the selenium tests in the IDE.</p>
+      <p>Sometimes there is a problem with Firefox. You may try to use a different version, or an installation without
+        plugins.</p>
+    </tc:section>
+
+    <tc:section id="integrationTestTobago3" label="Tobago 3">
+      <p>In the tobago-example-demo application, the pages can be checked with QUnit/Arquillian.
+        To run the full test automatically call</p>
+      <pre><code class="language-markup">cd tobago-example/tobago-example-demo
+mvn verify -Pqunit-integration-tests</code></pre>
+      <p>The default arquillian browser is 'phantomjs'.
+        You can change it in tobago-example-demo/pom.xml &lt;arquillian.browser>.</p>
+      <p>If you want to run the tests from your IDE, please use the maven profile 'tomee'.
+        After that, you can start the test from the QUnitTests class.</p>
+    </tc:section>
+
+    <tc:section id="integrationTestTobago4" label="Tobago 4">
+      <p>Since Tobago 4.2.2 the integration tests are reimplemented with docker.</p>
+      <p>To run the integration tests:</p>
+      <pre><code class="language-markup">cd tobago-example/tobago-example-demo
+mvn -Pdocker-qunit-tests</code></pre>
+      <p>You can also just start/stop the docker container manually to run the tests from your IDE.</p>
+      <pre><code class="language-markup">mvn -Pdocker-qunit-tests docker:start
+mvn -Pdocker-qunit-tests docker:stop</code></pre>
+    </tc:section>
   </tc:section>
 
   <tc:section id="testInBrowser" label="How can I run tests in the browser? (Tobago 3)">
diff --git a/tobago-example/tobago-example-demo/src/test/java/org/apache/myfaces/tobago/example/demo/qunit/StandardTest.java b/tobago-example/tobago-example-demo/src/test/java/org/apache/myfaces/tobago/example/demo/qunit/StandardTest.java
index 370429e..1d2d6e6 100644
--- a/tobago-example/tobago-example-demo/src/test/java/org/apache/myfaces/tobago/example/demo/qunit/StandardTest.java
+++ b/tobago-example/tobago-example-demo/src/test/java/org/apache/myfaces/tobago/example/demo/qunit/StandardTest.java
@@ -44,6 +44,7 @@ class StandardTest extends SeleniumBase {
 
   /**
    * To test only a singe page, just change browser setup, 'portContextPath' and/or 'path'.
+   * Start the docker container with mvn -Pdocker-qunit-tests docker:start
    */
   @Test
   void testSinglePage() throws MalformedURLException, UnknownHostException, UnsupportedEncodingException {

-- 
To stop receiving notification emails like this one, please contact
hnoeth@apache.org.