You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by hl...@apache.org on 2012/12/16 02:17:32 UTC

[11/50] git commit: Fix app folder test

Fix app folder test


Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/9a928a0b
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/9a928a0b
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/9a928a0b

Branch: refs/heads/master
Commit: 9a928a0ba760ba3b7c9befd959231bf264f75d62
Parents: 646b25f
Author: Howard M. Lewis Ship <hl...@apache.org>
Authored: Fri Dec 14 10:23:47 2012 -0800
Committer: Howard M. Lewis Ship <hl...@apache.org>
Committed: Fri Dec 14 10:23:47 2012 -0800

----------------------------------------------------------------------
 tapestry-core/src/test/conf/testng.xml             |    1 -
 .../integration/appfolder/AppFolderTests.groovy    |    6 +++++-
 2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/9a928a0b/tapestry-core/src/test/conf/testng.xml
----------------------------------------------------------------------
diff --git a/tapestry-core/src/test/conf/testng.xml b/tapestry-core/src/test/conf/testng.xml
index 0807d32..af30d7f 100644
--- a/tapestry-core/src/test/conf/testng.xml
+++ b/tapestry-core/src/test/conf/testng.xml
@@ -91,7 +91,6 @@
     </test>
 
     <test name="AppFolder Tests" enabled="true">
-        <parameter name="tapestry.web-app-folder" value="src/test/appfolder"/>
         <packages>
             <package name="org.apache.tapestry5.integration.appfolder"/>
         </packages>

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/9a928a0b/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/appfolder/AppFolderTests.groovy
----------------------------------------------------------------------
diff --git a/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/appfolder/AppFolderTests.groovy b/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/appfolder/AppFolderTests.groovy
index 4737e05..57818a5 100644
--- a/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/appfolder/AppFolderTests.groovy
+++ b/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/appfolder/AppFolderTests.groovy
@@ -1,8 +1,10 @@
 package org.apache.tapestry5.integration.appfolder
 
 import org.apache.tapestry5.integration.GroovyTapestryCoreTestCase
+import org.apache.tapestry5.test.TapestryTestConfiguration
 import org.testng.annotations.Test
 
+@TapestryTestConfiguration(webAppFolder = "src/test/appfolder")
 class AppFolderTests extends GroovyTapestryCoreTestCase
 {
 
@@ -31,7 +33,9 @@ class AppFolderTests extends GroovyTapestryCoreTestCase
     {
         openLinks "t5app/", "show index page alert"
 
-        assertText "css=div.t-message-container", "index page alert"
+        waitForPageInitialized()
+
+        assertTextPresent "index page alert"
     }
 
     @Test