Author: erinnp
Date: Mon Jul 1 16:17:58 2013
New Revision: 1498545
URL: http://svn.apache.org/r1498545
Log:
fix merge issue with patch
Modified:
rave/branches/require/rave-portal-resources/pom.xml
rave/branches/require/rave-portal-resources/src/test/javascript/core/rave_ajax.spec
Modified: rave/branches/require/rave-portal-resources/pom.xml
URL:
http://svn.apache.org/viewvc/rave/branches/require/rave-portal-resources/pom.xml?rev=1498545&r1=1498544&r2=1498545&view=diff
==============================================================================
--- rave/branches/require/rave-portal-resources/pom.xml (original)
+++ rave/branches/require/rave-portal-resources/pom.xml Mon Jul 1 16:17:58 2013
@@ -126,7 +126,7 @@
<include>core/rave_widget.js</include>
<include>core/rave_widget_manager.js</include>
<include>core/rave_view_manager.js</include>
- <include>core/rave_ajax.js</include>
+ <include>core/rave_openajax_hub.js</include>
</sourceIncludes>
<preloadSources>
<source>/src/test/dependencies/require.js</source>
Modified:
rave/branches/require/rave-portal-resources/src/test/javascript/core/rave_ajax.spec
URL:
http://svn.apache.org/viewvc/rave/branches/require/rave-portal-resources/src/test/javascript/core/rave_ajax.spec?rev=1498545&r1=1498544&r2=1498545&view=diff
==============================================================================
---
rave/branches/require/rave-portal-resources/src/test/javascript/core/rave_ajax.spec
(original)
+++
rave/branches/require/rave-portal-resources/src/test/javascript/core/rave_ajax.spec
Mon Jul 1 16:17:58 2013
@@ -1,7 +1 @@
-ajax = testr('core/rave_ajax');
-
-describe('rave_ajax', function(){
- it('pass!', function(){
- expect(ajax).toBeTruthy();
- })
-})
+ajax = testr('core/rave_ajax');
\ No newline at end of file
