Author: hlship
Date: Tue Dec 15 18:50:52 2009
New Revision: 890939
URL: http://svn.apache.org/viewvc?rev=890939&view=rev
Log:
Fix bad merge of asset protection logic.
Added:
tapestry/tapestry5/trunk/tapestry-core/src/test/resources/org/apache/tapestry5/integration/app1/unavailablefile.txt
(with props)
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/CoreBehaviorsTests.java
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/CoreBehaviorsTests.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/CoreBehaviorsTests.java?rev=890939&r1=890938&r2=890939&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/CoreBehaviorsTests.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/CoreBehaviorsTests.java
Tue Dec 15 18:50:52 2009
@@ -1230,18 +1230,6 @@
assertTextPresent("read Bar");
}
- /** TAP5-815 */
- @Test
- public void testAssetProtection()
- {
- clickThru("Asset Protection Demo", "Unavailable File");
-
- assertTextPresent("404");
-
- clickThru("Asset Protection Demo", "Available File");
-
- assertTextPresent("This file should be available to clients.");
- }
/**
* TAPESTRY-1598
Added:
tapestry/tapestry5/trunk/tapestry-core/src/test/resources/org/apache/tapestry5/integration/app1/unavailablefile.txt
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/resources/org/apache/tapestry5/integration/app1/unavailablefile.txt?rev=890939&view=auto
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/test/resources/org/apache/tapestry5/integration/app1/unavailablefile.txt
(added)
+++
tapestry/tapestry5/trunk/tapestry-core/src/test/resources/org/apache/tapestry5/integration/app1/unavailablefile.txt
Tue Dec 15 18:50:52 2009
@@ -0,0 +1 @@
+This file should not be available to clients.
\ No newline at end of file
Propchange:
tapestry/tapestry5/trunk/tapestry-core/src/test/resources/org/apache/tapestry5/integration/app1/unavailablefile.txt
------------------------------------------------------------------------------
svn:eol-style = native
