climate-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jo...@apache.org
Subject svn commit: r1493781 - in /incubator/climate/trunk/rcmet/src/main/ui: config/ scripts/
Date Mon, 17 Jun 2013 14:33:48 GMT
Author: joyce
Date: Mon Jun 17 14:33:47 2013
New Revision: 1493781

URL: http://svn.apache.org/r1493781
Log:
Resolve CLIMATE-111 - Switch tests over to Karma

- Remove extra Karma config files in scripts folder.
- Rename testacular configs to karma
- Make test scripts use karma command and renamed karma config files

Added:
    incubator/climate/trunk/rcmet/src/main/ui/config/karma-e2e.conf.js
      - copied, changed from r1493767, incubator/climate/trunk/rcmet/src/main/ui/config/testacular-e2e.conf.js
    incubator/climate/trunk/rcmet/src/main/ui/config/karma.conf.js
      - copied, changed from r1493767, incubator/climate/trunk/rcmet/src/main/ui/config/testacular.conf.js
Removed:
    incubator/climate/trunk/rcmet/src/main/ui/config/testacular-e2e.conf.js
    incubator/climate/trunk/rcmet/src/main/ui/config/testacular.conf.js
    incubator/climate/trunk/rcmet/src/main/ui/scripts/testacular-e2e.conf.js
    incubator/climate/trunk/rcmet/src/main/ui/scripts/testacular.conf.js
Modified:
    incubator/climate/trunk/rcmet/src/main/ui/scripts/e2e-test.sh
    incubator/climate/trunk/rcmet/src/main/ui/scripts/test.sh

Copied: incubator/climate/trunk/rcmet/src/main/ui/config/karma-e2e.conf.js (from r1493767,
incubator/climate/trunk/rcmet/src/main/ui/config/testacular-e2e.conf.js)
URL: http://svn.apache.org/viewvc/incubator/climate/trunk/rcmet/src/main/ui/config/karma-e2e.conf.js?p2=incubator/climate/trunk/rcmet/src/main/ui/config/karma-e2e.conf.js&p1=incubator/climate/trunk/rcmet/src/main/ui/config/testacular-e2e.conf.js&r1=1493767&r2=1493781&rev=1493781&view=diff
==============================================================================
    (empty)

Copied: incubator/climate/trunk/rcmet/src/main/ui/config/karma.conf.js (from r1493767, incubator/climate/trunk/rcmet/src/main/ui/config/testacular.conf.js)
URL: http://svn.apache.org/viewvc/incubator/climate/trunk/rcmet/src/main/ui/config/karma.conf.js?p2=incubator/climate/trunk/rcmet/src/main/ui/config/karma.conf.js&p1=incubator/climate/trunk/rcmet/src/main/ui/config/testacular.conf.js&r1=1493767&r2=1493781&rev=1493781&view=diff
==============================================================================
    (empty)

Modified: incubator/climate/trunk/rcmet/src/main/ui/scripts/e2e-test.sh
URL: http://svn.apache.org/viewvc/incubator/climate/trunk/rcmet/src/main/ui/scripts/e2e-test.sh?rev=1493781&r1=1493780&r2=1493781&view=diff
==============================================================================
--- incubator/climate/trunk/rcmet/src/main/ui/scripts/e2e-test.sh (original)
+++ incubator/climate/trunk/rcmet/src/main/ui/scripts/e2e-test.sh Mon Jun 17 14:33:47 2013
@@ -3,7 +3,7 @@
 BASE_DIR=`dirname $0`
 
 echo ""
-echo "Starting Testacular Server (http://vojtajina.github.com/testacular)"
+echo "Starting Karma Server"
 echo "-------------------------------------------------------------------"
 
-testacular start $BASE_DIR/../config/testacular-e2e.conf.js $*
+karma start $BASE_DIR/../config/karma-e2e.conf.js $*

Modified: incubator/climate/trunk/rcmet/src/main/ui/scripts/test.sh
URL: http://svn.apache.org/viewvc/incubator/climate/trunk/rcmet/src/main/ui/scripts/test.sh?rev=1493781&r1=1493780&r2=1493781&view=diff
==============================================================================
--- incubator/climate/trunk/rcmet/src/main/ui/scripts/test.sh (original)
+++ incubator/climate/trunk/rcmet/src/main/ui/scripts/test.sh Mon Jun 17 14:33:47 2013
@@ -3,7 +3,7 @@
 BASE_DIR=`dirname $0`
 
 echo ""
-echo "Starting Testacular Server (http://vojtajina.github.com/testacular)"
+echo "Starting Karma Server"
 echo "-------------------------------------------------------------------"
 
-testacular start $BASE_DIR/../config/testacular.conf.js $*
+karma start $BASE_DIR/../config/karma.conf.js $*



Mime
View raw message