svn commit: r1497548 [1/3] - in /rave/branches/require/rave-portal-resources: ./ src/test/ src/test/dependencies/ src/test/javascript/core/

[erinnp]

Author: erinnp
Date: Thu Jun 27 20:05:28 2013
New Revision: 1497548

URL: http://svn.apache.org/r1497548
Log:
configure tests to run with require.js and testr for mock DI

Added:
    rave/branches/require/rave-portal-resources/src/test/dependencies/osapi.js
    rave/branches/require/rave-portal-resources/src/test/dependencies/testr.js
    rave/branches/require/rave-portal-resources/src/test/javascript/core/
    
rave/branches/require/rave-portal-resources/src/test/javascript/core/rave_ajax.spec
    
rave/branches/require/rave-portal-resources/src/test/javascript/core/rave_api.spec
    
rave/branches/require/rave-portal-resources/src/test/javascript/core/rave_state_manager.spec
    rave/branches/require/rave-portal-resources/src/test/requireConfig.js
    
rave/branches/require/rave-portal-resources/src/test/testTemplate.htmltemplate
Removed:
    rave/branches/require/rave-portal-resources/src/test/customJasmineConfig.txt
Modified:
    rave/branches/require/rave-portal-resources/pom.xml

Modified: rave/branches/require/rave-portal-resources/pom.xml
URL: 
http://svn.apache.org/viewvc/rave/branches/require/rave-portal-resources/pom.xml?rev=1497548&r1=1497547&r2=1497548&view=diff
==============================================================================
--- rave/branches/require/rave-portal-resources/pom.xml (original)
+++ rave/branches/require/rave-portal-resources/pom.xml Thu Jun 27 20:05:28 2013
@@ -113,36 +113,22 @@
                             <goal>bdd</goal>
                             <goal>test</goal>
                         </goals>
-                        <!--<configuration>-->
-                            <!--<preloadSources>-->
-                                
<!--<source>${project.basedir}/src/test/dependencies/underscore.js</source>-->
-                            <!--</preloadSources>-->
-                            
<!--<jsSrcDir>${project.basedir}/src/main/webapp/static/script/core</jsSrcDir>-->
-                            <!--<debug>true</debug>-->
-                            <!--<sourceIncludes>-->
-                                
<!--<include>rave_widget_manager.js</include>-->
-                                <!--<include>rave_api.js</include>-->
-                                <!--<include>rave_widget.js</include>-->
-                                <!--<include>rave_opensocial.js</include>-->
-                                <!--<include>rave_wookie.js</include>-->
-                            <!--</sourceIncludes>-->
-                            <!--<sourceExcludes>-->
-                                <!--&lt;!&ndash; rave_ajax can be excluded 
since it is just a wrapper for jquery.ajax &ndash;&gt;-->
-                                <!--<include>rave_ajax.js</include>-->
-                                <!--&lt;!&ndash; exclude the combined js file 
from our tests, created by the wro4j plugin  &ndash;&gt;-->
-                                <!--<exclude>*.min.js</exclude>-->
-                            <!--</sourceExcludes>-->
-                        <!--</configuration>-->
                     </execution>
                 </executions>
                 <configuration>
-                    <specRunnerTemplate>REQUIRE_JS</specRunnerTemplate>
-                    
<jsSrcDir>${project.basedir}/src/main/webapp/static/script/core</jsSrcDir>
+                    
<jsSrcDir>${project.basedir}/src/main/webapp/static/script</jsSrcDir>
                     
<jsTestSrcDir>${project.basedir}/src/test/javascript</jsTestSrcDir>
-                    
<customRunnerConfiguration>${project.basedir}/src/test/customJasmineConfig.txt</customRunnerConfiguration>
+                    <specDirectoryName>/src/test/javascript</specDirectoryName>
+                    <sourceIncludes>
+                        <include>core/rave_api.js</include>
+                        <include>core/rave_ajax.js</include>
+                    </sourceIncludes>
                     <preloadSources>
-                        
<source>${project.basedir}/src/test/dependencies/require.js</source>
+                        
<source>http://localhost:8234/src/test/dependencies/require.js</source>
+                        
<source>http://localhost:8234/src/test/dependencies/testr.js</source>
+                        
<source>http://localhost:8234/src/test/dependencies/underscore.js</source>
                     </preloadSources>
+                    
<customRunnerTemplate>src/test/testTemplate.htmltemplate</customRunnerTemplate>
                 </configuration>
             </plugin>
             <!--