myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lof...@apache.org
Subject svn commit: r1772315 - in /myfaces/tobago/trunk/tobago-example/tobago-example-demo/src: main/webapp/menu.xhtml main/webapp/test.xhtml test/java/org/apache/myfaces/tobago/example/demo/QUnitTests.java
Date Fri, 02 Dec 2016 08:45:26 GMT
Author: lofwyr
Date: Fri Dec  2 08:45:26 2016
New Revision: 1772315

URL: http://svn.apache.org/viewvc?rev=1772315&view=rev
Log:
TOBAGO-1636 End of theme-dependent resource selection (ResourceManager)
* fix QUnitTests (and "mvn verify -Pqunit-integration-tests")
[developed by hnoeth]

Modified:
    myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/menu.xhtml
    myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/test.xhtml
    myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/test/java/org/apache/myfaces/tobago/example/demo/QUnitTests.java

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/menu.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/menu.xhtml?rev=1772315&r1=1772314&r2=1772315&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/menu.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/menu.xhtml Fri
Dec  2 08:45:26 2016
@@ -122,8 +122,8 @@
                      label="Run Test"
                      immediate="true" tip="Run Test"
                      rendered="#{testController.testJs != null}">
-            <f:param name="page" value="#{testController.page}"/>
-            <f:param name="testjs" value="#{testController.testJs}"/>
+            <f:param name="page" value="#{request.contextPath}#{testController.page}"/>
+            <f:param name="testjs" value="#{request.contextPath}/#{testController.testJs}"/>
           </tc:button>
           <tc:button id="closetest" label="Close Test"
                      immediate="true" tip="Close test window"/>

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/test.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/test.xhtml?rev=1772315&r1=1772314&r2=1772315&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/test.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/test.xhtml Fri
Dec  2 08:45:26 2016
@@ -21,10 +21,10 @@
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
                 xmlns:ui="http://java.sun.com/jsf/facelets"
                 xmlns="http://www.w3.org/1999/xhtml">
-  <tc:script file="script/demo.js"/>
-  <tc:script file="script/qunit-1.23.1.js"/>
-  <tc:script file="script/tobago-test.js"/>
-  <tc:style file="style/qunit-1.23.1.css"/>
+  <tc:script file="#{request.contextPath}/script/demo.js"/>
+  <tc:script file="#{request.contextPath}/script/qunit-1.23.1.js"/>
+  <tc:script file="#{request.contextPath}/script/tobago-test.js"/>
+  <tc:style file="#{request.contextPath}/style/qunit-1.23.1.css"/>
   <tc:script file="#{param['testjs']}"/>
 
   <div id="qunit"></div>

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/test/java/org/apache/myfaces/tobago/example/demo/QUnitTests.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/test/java/org/apache/myfaces/tobago/example/demo/QUnitTests.java?rev=1772315&r1=1772314&r2=1772315&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/test/java/org/apache/myfaces/tobago/example/demo/QUnitTests.java
(original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/test/java/org/apache/myfaces/tobago/example/demo/QUnitTests.java
Fri Dec  2 08:45:26 2016
@@ -77,7 +77,7 @@ public class QUnitTests {
   private void setupBrowser(String page, String testJs) throws UnsupportedEncodingException
{
     LOG.info("setup browser for: " + page);
     browser.get(contextPath + "/faces/test.xhtml?page=" + URLEncoder.encode(page, "UTF-8")
+ "&testjs="
-        + URLEncoder.encode(testJs, "UTF-8"));
+        + contextPath + URLEncoder.encode(testJs, "UTF-8"));
   }
 
   private void runStandardTest(String page) throws UnsupportedEncodingException, InterruptedException
{



Mime
View raw message