From c9c176a53b1632ca2b1c6ed27382ab72ac21d45d Mon Sep 17 00:00:00 2001 From: Adam Abrons Date: Tue, 5 Jan 2010 16:36:58 -0800 Subject: angular.js --- jsTestDriver.conf | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 jsTestDriver.conf (limited to 'jsTestDriver.conf') diff --git a/jsTestDriver.conf b/jsTestDriver.conf new file mode 100644 index 00000000..77a5f0bf --- /dev/null +++ b/jsTestDriver.conf @@ -0,0 +1,16 @@ +server: http://localhost:9876 + +load: + - lib/swfobject/swfobject.js + - lib/webtoolkit/webtoolkit.base64.js + - lib/jquery/jquery-1.3.2.js + - lib/jquery/jquery-ui-1.7.1.custom.min.js + - lib/underscore/underscore.js + - src/Loader.js + - src/*.js + - src/test/_namespace.js + - src/test/*.js + - test/testabilityPatch.js + - test/test/*.js + - test/*.js + \ No newline at end of file -- cgit v1.2.3 From 214c142d9de60a7f53d8c7ada2812ffff4837e0f Mon Sep 17 00:00:00 2001 From: Misko Hevery Date: Fri, 8 Jan 2010 16:04:35 -0800 Subject: created a way to init the code without autobootstrap --- jsTestDriver.conf | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'jsTestDriver.conf') diff --git a/jsTestDriver.conf b/jsTestDriver.conf index 77a5f0bf..97136e7b 100644 --- a/jsTestDriver.conf +++ b/jsTestDriver.conf @@ -1,7 +1,6 @@ server: http://localhost:9876 load: - - lib/swfobject/swfobject.js - lib/webtoolkit/webtoolkit.base64.js - lib/jquery/jquery-1.3.2.js - lib/jquery/jquery-ui-1.7.1.custom.min.js @@ -13,4 +12,6 @@ load: - test/testabilityPatch.js - test/test/*.js - test/*.js - \ No newline at end of file + +exclude: + - src/angular-bootstrap.js -- cgit v1.2.3 From 9b9a0dadcce82ae42ac09ad396d647739af20a06 Mon Sep 17 00:00:00 2001 From: Misko Hevery Date: Sat, 9 Jan 2010 15:02:43 -0800 Subject: removed nglr namespace --- jsTestDriver.conf | 3 +++ 1 file changed, 3 insertions(+) (limited to 'jsTestDriver.conf') diff --git a/jsTestDriver.conf b/jsTestDriver.conf index 97136e7b..ebd45d9d 100644 --- a/jsTestDriver.conf +++ b/jsTestDriver.conf @@ -15,3 +15,6 @@ load: exclude: - src/angular-bootstrap.js + - src/angular.prefix + - src/angular.suffix + \ No newline at end of file -- cgit v1.2.3 From 595b4ea097bcb512173b6d4a12924ea1a3d70ecd Mon Sep 17 00:00:00 2001 From: Misko Hevery Date: Mon, 18 Jan 2010 10:47:03 -0800 Subject: checkpoint for integration with angular --- jsTestDriver.conf | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'jsTestDriver.conf') diff --git a/jsTestDriver.conf b/jsTestDriver.conf index ebd45d9d..1fbe05a7 100644 --- a/jsTestDriver.conf +++ b/jsTestDriver.conf @@ -5,7 +5,7 @@ load: - lib/jquery/jquery-1.3.2.js - lib/jquery/jquery-ui-1.7.1.custom.min.js - lib/underscore/underscore.js - - src/Loader.js + - src/Angular.js - src/*.js - src/test/_namespace.js - src/test/*.js @@ -14,7 +14,5 @@ load: - test/*.js exclude: - - src/angular-bootstrap.js - src/angular.prefix - src/angular.suffix - \ No newline at end of file -- cgit v1.2.3 From 4460328bc1173f5d97fb4ff54edc041968486fce Mon Sep 17 00:00:00 2001 From: Misko Hevery Date: Sat, 23 Jan 2010 15:54:58 -0800 Subject: lots of cleanup to get it ready for OS --- jsTestDriver.conf | 2 ++ 1 file changed, 2 insertions(+) (limited to 'jsTestDriver.conf') diff --git a/jsTestDriver.conf b/jsTestDriver.conf index 1fbe05a7..28958ee4 100644 --- a/jsTestDriver.conf +++ b/jsTestDriver.conf @@ -1,6 +1,8 @@ server: http://localhost:9876 load: + - lib/jasmine/jasmine-0.10.0.js + - lib/jasmine-jstd-adapter/JasmineAdapter.js - lib/webtoolkit/webtoolkit.base64.js - lib/jquery/jquery-1.3.2.js - lib/jquery/jquery-ui-1.7.1.custom.min.js -- cgit v1.2.3 From efad9ec5be8da442af5fb3dffc08510f7a71e10f Mon Sep 17 00:00:00 2001 From: Misko Hevery Date: Sun, 24 Jan 2010 17:10:58 -0800 Subject: changes to make it closure compiler compatible --- jsTestDriver.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'jsTestDriver.conf') diff --git a/jsTestDriver.conf b/jsTestDriver.conf index 28958ee4..6c2cf0bb 100644 --- a/jsTestDriver.conf +++ b/jsTestDriver.conf @@ -4,7 +4,7 @@ load: - lib/jasmine/jasmine-0.10.0.js - lib/jasmine-jstd-adapter/JasmineAdapter.js - lib/webtoolkit/webtoolkit.base64.js - - lib/jquery/jquery-1.3.2.js + - lib/jquery/jquery-1.4.0.js - lib/jquery/jquery-ui-1.7.1.custom.min.js - lib/underscore/underscore.js - src/Angular.js -- cgit v1.2.3 From ba9eef40cfbb6cd969d566b43fd9129642d01351 Mon Sep 17 00:00:00 2001 From: Misko Hevery Date: Mon, 25 Jan 2010 20:30:22 -0800 Subject: fix jquery version in jstd.conf --- jsTestDriver.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'jsTestDriver.conf') diff --git a/jsTestDriver.conf b/jsTestDriver.conf index 6c2cf0bb..766b8c73 100644 --- a/jsTestDriver.conf +++ b/jsTestDriver.conf @@ -4,7 +4,7 @@ load: - lib/jasmine/jasmine-0.10.0.js - lib/jasmine-jstd-adapter/JasmineAdapter.js - lib/webtoolkit/webtoolkit.base64.js - - lib/jquery/jquery-1.4.0.js + - lib/jquery/jquery-1.4.js - lib/jquery/jquery-ui-1.7.1.custom.min.js - lib/underscore/underscore.js - src/Angular.js -- cgit v1.2.3 From 2880411713bf051b0d30b0a1f3531a34272f3b25 Mon Sep 17 00:00:00 2001 From: Misko Hevery Date: Fri, 29 Jan 2010 10:15:15 -0800 Subject: added bootstrap, fixed formatter --- jsTestDriver.conf | 1 + 1 file changed, 1 insertion(+) (limited to 'jsTestDriver.conf') diff --git a/jsTestDriver.conf b/jsTestDriver.conf index 766b8c73..8b36e7d4 100644 --- a/jsTestDriver.conf +++ b/jsTestDriver.conf @@ -18,3 +18,4 @@ load: exclude: - src/angular.prefix - src/angular.suffix + - src/angular-bootstrap.js -- cgit v1.2.3 From cc71b745c3c821f5e012a363ae3267252a81fddb Mon Sep 17 00:00:00 2001 From: Misko Hevery Date: Mon, 15 Mar 2010 14:36:50 -0700 Subject: added resources; removed compiled code --- jsTestDriver.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'jsTestDriver.conf') diff --git a/jsTestDriver.conf b/jsTestDriver.conf index 8b36e7d4..c048a294 100644 --- a/jsTestDriver.conf +++ b/jsTestDriver.conf @@ -1,7 +1,7 @@ server: http://localhost:9876 load: - - lib/jasmine/jasmine-0.10.0.js + - lib/jasmine/jasmine-0.10.1.js - lib/jasmine-jstd-adapter/JasmineAdapter.js - lib/webtoolkit/webtoolkit.base64.js - lib/jquery/jquery-1.4.js -- cgit v1.2.3 From c9aba8b442adce496f0600c88764f7ffcc166879 Mon Sep 17 00:00:00 2001 From: Adam Abrons Date: Tue, 16 Mar 2010 14:48:11 -0700 Subject: make xhr just a method --- jsTestDriver.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'jsTestDriver.conf') diff --git a/jsTestDriver.conf b/jsTestDriver.conf index c048a294..da821ad1 100644 --- a/jsTestDriver.conf +++ b/jsTestDriver.conf @@ -9,10 +9,10 @@ load: - lib/underscore/underscore.js - src/Angular.js - src/*.js - - src/test/_namespace.js - - src/test/*.js + - src/scenario/_namespace.js + - src/scenario/*.js - test/testabilityPatch.js - - test/test/*.js + - test/scenario/*.js - test/*.js exclude: -- cgit v1.2.3 From 7c87c17d08dbba318af1a149c0bbedb696b03458 Mon Sep 17 00:00:00 2001 From: Misko Hevery Date: Mon, 22 Mar 2010 18:20:49 -0700 Subject: upgraded jquery to 1.4.2 and made ng-action work with jquery --- jsTestDriver.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'jsTestDriver.conf') diff --git a/jsTestDriver.conf b/jsTestDriver.conf index da821ad1..245140d7 100644 --- a/jsTestDriver.conf +++ b/jsTestDriver.conf @@ -4,7 +4,7 @@ load: - lib/jasmine/jasmine-0.10.1.js - lib/jasmine-jstd-adapter/JasmineAdapter.js - lib/webtoolkit/webtoolkit.base64.js - - lib/jquery/jquery-1.4.js + - lib/jquery/jquery-1.4.2.min.js - lib/jquery/jquery-ui-1.7.1.custom.min.js - lib/underscore/underscore.js - src/Angular.js -- cgit v1.2.3 From e55c97debaa0ef8487ece219b6eadbc147ece1f9 Mon Sep 17 00:00:00 2001 From: Misko Hevery Date: Mon, 29 Mar 2010 20:25:42 -0700 Subject: dissabled a lot of tests, and made the core test set pass. --- jsTestDriver.conf | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'jsTestDriver.conf') diff --git a/jsTestDriver.conf b/jsTestDriver.conf index 245140d7..21851c99 100644 --- a/jsTestDriver.conf +++ b/jsTestDriver.conf @@ -4,9 +4,8 @@ load: - lib/jasmine/jasmine-0.10.1.js - lib/jasmine-jstd-adapter/JasmineAdapter.js - lib/webtoolkit/webtoolkit.base64.js - - lib/jquery/jquery-1.4.2.min.js - - lib/jquery/jquery-ui-1.7.1.custom.min.js - - lib/underscore/underscore.js +# - lib/jquery/jquery-1.4.2.js +# - lib/underscore/underscore.js - src/Angular.js - src/*.js - src/scenario/_namespace.js -- cgit v1.2.3 From 7a4b48020688060debe9cb0f9c17615d7585cbe7 Mon Sep 17 00:00:00 2001 From: Misko Hevery Date: Mon, 5 Apr 2010 11:46:53 -0700 Subject: added ng:switch widget --- jsTestDriver.conf | 2 ++ 1 file changed, 2 insertions(+) (limited to 'jsTestDriver.conf') diff --git a/jsTestDriver.conf b/jsTestDriver.conf index 21851c99..a0cae9a4 100644 --- a/jsTestDriver.conf +++ b/jsTestDriver.conf @@ -11,6 +11,7 @@ load: - src/scenario/_namespace.js - src/scenario/*.js - test/testabilityPatch.js + - test/angular-mocks.js - test/scenario/*.js - test/*.js @@ -18,3 +19,4 @@ exclude: - src/angular.prefix - src/angular.suffix - src/angular-bootstrap.js + - src/AngularPublic.js -- cgit v1.2.3 From 843bd355d25ebf2369aec79f98cb6704d38497e9 Mon Sep 17 00:00:00 2001 From: Misko Hevery Date: Fri, 9 Apr 2010 16:20:15 -0700 Subject: various bug fixes --- jsTestDriver.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'jsTestDriver.conf') diff --git a/jsTestDriver.conf b/jsTestDriver.conf index a0cae9a4..9c2ef63f 100644 --- a/jsTestDriver.conf +++ b/jsTestDriver.conf @@ -1,9 +1,9 @@ server: http://localhost:9876 load: - - lib/jasmine/jasmine-0.10.1.js + - lib/jasmine/jasmine-0.10.3.js - lib/jasmine-jstd-adapter/JasmineAdapter.js - - lib/webtoolkit/webtoolkit.base64.js +# - lib/webtoolkit/webtoolkit.base64.js # - lib/jquery/jquery-1.4.2.js # - lib/underscore/underscore.js - src/Angular.js -- cgit v1.2.3 From 2a9669e1d853d4e18d2eb1f07e84ee5baec838c2 Mon Sep 17 00:00:00 2001 From: Misko Hevery Date: Thu, 22 Apr 2010 15:50:20 -0700 Subject: working on jQuery passing tests --- jsTestDriver.conf | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'jsTestDriver.conf') diff --git a/jsTestDriver.conf b/jsTestDriver.conf index 9c2ef63f..196d282f 100644 --- a/jsTestDriver.conf +++ b/jsTestDriver.conf @@ -3,9 +3,7 @@ server: http://localhost:9876 load: - lib/jasmine/jasmine-0.10.3.js - lib/jasmine-jstd-adapter/JasmineAdapter.js -# - lib/webtoolkit/webtoolkit.base64.js -# - lib/jquery/jquery-1.4.2.js -# - lib/underscore/underscore.js + - lib/jquery/jquery-1.4.2.js - src/Angular.js - src/*.js - src/scenario/_namespace.js -- cgit v1.2.3 From fe434307d15d697a5ffade51bad068f6443965b2 Mon Sep 17 00:00:00 2001 From: Misko Hevery Date: Thu, 22 Apr 2010 17:11:56 -0700 Subject: tests work under jquery and without --- jsTestDriver.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'jsTestDriver.conf') diff --git a/jsTestDriver.conf b/jsTestDriver.conf index 196d282f..e2820ddb 100644 --- a/jsTestDriver.conf +++ b/jsTestDriver.conf @@ -3,7 +3,7 @@ server: http://localhost:9876 load: - lib/jasmine/jasmine-0.10.3.js - lib/jasmine-jstd-adapter/JasmineAdapter.js - - lib/jquery/jquery-1.4.2.js +# - lib/jquery/jquery-1.4.2.js - src/Angular.js - src/*.js - src/scenario/_namespace.js -- cgit v1.2.3 From 5215e2095cfd42a0363eb02eded34e03fa2b0cd3 Mon Sep 17 00:00:00 2001 From: Misko Hevery Date: Thu, 20 May 2010 15:55:41 -0700 Subject: basic end to end runner --- jsTestDriver.conf | 1 - 1 file changed, 1 deletion(-) (limited to 'jsTestDriver.conf') diff --git a/jsTestDriver.conf b/jsTestDriver.conf index e2820ddb..6f959b8f 100644 --- a/jsTestDriver.conf +++ b/jsTestDriver.conf @@ -6,7 +6,6 @@ load: # - lib/jquery/jquery-1.4.2.js - src/Angular.js - src/*.js - - src/scenario/_namespace.js - src/scenario/*.js - test/testabilityPatch.js - test/angular-mocks.js -- cgit v1.2.3 From f6c67e28c94033edf6a16eb6508de54679cb49db Mon Sep 17 00:00:00 2001 From: Andres Ornelas Mesta Date: Mon, 24 May 2010 13:54:32 -0700 Subject: happy --- jsTestDriver.conf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'jsTestDriver.conf') diff --git a/jsTestDriver.conf b/jsTestDriver.conf index 6f959b8f..4a702a3e 100644 --- a/jsTestDriver.conf +++ b/jsTestDriver.conf @@ -3,7 +3,8 @@ server: http://localhost:9876 load: - lib/jasmine/jasmine-0.10.3.js - lib/jasmine-jstd-adapter/JasmineAdapter.js -# - lib/jquery/jquery-1.4.2.js + - lib/jquery/jquery-1.4.2.js + - test/jquery_remove.js - src/Angular.js - src/*.js - src/scenario/*.js @@ -13,6 +14,7 @@ load: - test/*.js exclude: + - test/jquery_alias.js - src/angular.prefix - src/angular.suffix - src/angular-bootstrap.js -- cgit v1.2.3 From 3fab5d9879272b9f991a67c8135754f00c055834 Mon Sep 17 00:00:00 2001 From: Andres Ornelas Date: Mon, 24 May 2010 15:25:30 -0700 Subject: added error handling on scenario definition --- jsTestDriver.conf | 1 + 1 file changed, 1 insertion(+) (limited to 'jsTestDriver.conf') diff --git a/jsTestDriver.conf b/jsTestDriver.conf index 4a702a3e..c28e9ff1 100644 --- a/jsTestDriver.conf +++ b/jsTestDriver.conf @@ -7,6 +7,7 @@ load: - test/jquery_remove.js - src/Angular.js - src/*.js + - src/scenario/Runner.js - src/scenario/*.js - test/testabilityPatch.js - test/angular-mocks.js -- cgit v1.2.3 From 0d41c86522ef912fe5bb7a02fd434080f9827c00 Mon Sep 17 00:00:00 2001 From: Andres Ornelas Date: Wed, 26 May 2010 15:17:28 -0700 Subject: fixed broken jstd conf file --- jsTestDriver.conf | 1 + 1 file changed, 1 insertion(+) (limited to 'jsTestDriver.conf') diff --git a/jsTestDriver.conf b/jsTestDriver.conf index c28e9ff1..16bcf1db 100644 --- a/jsTestDriver.conf +++ b/jsTestDriver.conf @@ -19,4 +19,5 @@ exclude: - src/angular.prefix - src/angular.suffix - src/angular-bootstrap.js + - src/scenario/bootstrap.js - src/AngularPublic.js -- cgit v1.2.3