From f38b2ae325da2b6c54888c892298e4446fb5088c Mon Sep 17 00:00:00 2001 From: Alvin Huynh Date: Mon, 12 Nov 2012 17:58:31 -0800 Subject: [PATCH 1/4] Added more unit tests to viewport decorator. It now covers previous/next button clicks. --- test/viewport/test.js | 38 ++++++++++++++++++++++++++++++++++++- test/viewport/viewport.html | 18 +++++++++--------- 2 files changed, 46 insertions(+), 10 deletions(-) diff --git a/test/viewport/test.js b/test/viewport/test.js index df83811..f519957 100644 --- a/test/viewport/test.js +++ b/test/viewport/test.js @@ -1,8 +1,16 @@ function execute(){ var PagingList = $( '#list-paging' ).lu( 'getComponent', 'List' ), + PagingListPrevButton = $( '#list-paging-prev'), + PagingListNextButton = $( '#list-paging-next'), SlidingList = $( '#list-sliding' ).lu( 'getComponent', 'List' ), + SlidingListPrevButton = $( '#list-sliding-prev'), + SlidingListNextButton = $( '#list-sliding-next'), PagingCarousel = $( '#carousel-paging' ).lu( 'getComponent', 'Carousel' ), - SlidingCarousel = $( '#carousel-sliding' ).lu( 'getComponent', 'Carousel' ); + PagingCarouselPrevButton = $( '#carousel-paging-prev'), + PagingCarouselNextButton = $( '#carousel-paging-next'), + SlidingCarousel = $( '#carousel-sliding' ).lu( 'getComponent', 'Carousel' ) + SlidingCarouselPrevButton = $( '#carousel-sliding-prev'), + SlidingCarouselNextButton = $( '#carousel-sliding-next'); QUnit.module( 'List Viewport Decorator Test' ); @@ -73,4 +81,32 @@ function execute(){ start(); }); } ); + + QUnit.asyncTest( 'buttons', function(){ + + // Paging list + PagingListNextButton.click(); + ok(PagingList.instance.index() === 5); + PagingListPrevButton.click(); + ok(PagingList.instance.index() === 0); + + // Sliding List + SlidingListNextButton.click(); + ok(SlidingList.instance.index() === 1); + SlidingListPrevButton.click(); + ok(SlidingList.instance.index() === 0); + + // Paging Carousel + PagingCarouselPrevButton.click(); + ok(PagingCarousel.instance.index() === 9); + PagingCarouselNextButton.click(); + ok(PagingCarousel.instance.index() === 0); + + // Sliding Carousel + SlidingCarouselPrevButton.click(); + ok(SlidingCarousel.instance.index() === 13); + SlidingCarouselNextButton.click(); + ok(SlidingCarousel.instance.index() === 0); + start(); + } ); } diff --git a/test/viewport/viewport.html b/test/viewport/viewport.html index 916a5a5..528479d 100644 --- a/test/viewport/viewport.html +++ b/test/viewport/viewport.html @@ -94,8 +94,8 @@
  • 13
    • - - + +
    @@ -126,8 +126,8 @@
  • 13
    • - - + +
    @@ -160,8 +160,8 @@
  • 13
    • - - + +
    @@ -188,8 +188,8 @@
  • 13
    • - - + +
    @@ -215,7 +215,7 @@ Inject.setExpires( 0 ); Inject.clearCache(); - Inject.setModuleRoot( 'http://localhost:1337/' ); + Inject.setModuleRoot( 'http://ahuynh-mn:1337/' ); window.LU_DEBUG = 5; From 0a80da225a073f9f55781a1419c7166c368a511a Mon Sep 17 00:00:00 2001 From: Alvin Huynh Date: Mon, 19 Nov 2012 09:40:13 -0800 Subject: [PATCH 2/4] Changed back root to localhost Forgot to undo change I made when testing locally on IE. --- test/viewport/viewport.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/viewport/viewport.html b/test/viewport/viewport.html index 528479d..d0faf32 100644 --- a/test/viewport/viewport.html +++ b/test/viewport/viewport.html @@ -215,7 +215,7 @@ Inject.setExpires( 0 ); Inject.clearCache(); - Inject.setModuleRoot( 'http://ahuynh-mn:1337/' ); + Inject.setModuleRoot( 'http://localhost:1337/' ); window.LU_DEBUG = 5; From 4b6bada7eaebc44d66f689f1c79333ea87102292 Mon Sep 17 00:00:00 2001 From: Alvin Huynh Date: Mon, 19 Nov 2012 17:53:46 -0800 Subject: [PATCH 3/4] Fixed timing issues with viewport decorator unit tests I fixed timing issues introduced in the last commit when I added more unit tetsts regarding button components. --- test/viewport/test.js | 86 ++++++++++++++++++++++--------------- test/viewport/viewport.html | 2 +- 2 files changed, 53 insertions(+), 35 deletions(-) diff --git a/test/viewport/test.js b/test/viewport/test.js index f519957..89148cf 100644 --- a/test/viewport/test.js +++ b/test/viewport/test.js @@ -8,7 +8,7 @@ function execute(){ PagingCarousel = $( '#carousel-paging' ).lu( 'getComponent', 'Carousel' ), PagingCarouselPrevButton = $( '#carousel-paging-prev'), PagingCarouselNextButton = $( '#carousel-paging-next'), - SlidingCarousel = $( '#carousel-sliding' ).lu( 'getComponent', 'Carousel' ) + SlidingCarousel = $( '#carousel-sliding' ).lu( 'getComponent', 'Carousel' ), SlidingCarouselPrevButton = $( '#carousel-sliding-prev'), SlidingCarouselNextButton = $( '#carousel-sliding-next'); @@ -26,8 +26,21 @@ function execute(){ PagingList.instance.trigger('previous'); ok(PagingList.instance.index() === 0); ok(PagingList.instance.hasPrevious() === false); - start(); - }); + + PagingListNextButton.lu('getComponent','Button').ready(function() { + PagingList.instance.select(0); + PagingListNextButton.click(); + ok(PagingList.instance.index() === 5); + }); + PagingListPrevButton.lu('getComponent','Button').ready(function() { + PagingList.instance.select(5); + PagingListPrevButton.click(); + ok(PagingList.instance.index() === 0); + start(); + }); + }); + + } ); QUnit.asyncTest( 'sliding', function(){ @@ -43,7 +56,18 @@ function execute(){ ok(SlidingList.instance.index() === 12); ok(SlidingList.instance.hasNext() === true); ok(SlidingList.instance.hasPrevious() === true); - start(); + + SlidingListNextButton.lu('getComponent','Button').ready(function() { + SlidingList.instance.select(0); + SlidingListNextButton.click(); + ok(SlidingList.instance.index() === 1); + }); + SlidingListPrevButton.lu('getComponent','Button').ready(function() { + SlidingList.instance.select(1); + SlidingListPrevButton.click(); + ok(SlidingList.instance.index() === 0); + start(); + }); }); } ); @@ -61,7 +85,18 @@ function execute(){ ok(PagingCarousel.instance.hasPrevious() === true); PagingCarousel.instance.trigger('previous'); ok(PagingCarousel.instance.index() === 9); - start(); + + PagingCarouselNextButton.lu('getComponent','Button').ready(function() { + PagingCarousel.instance.select(0); + PagingCarouselPrevButton.click(); + ok(PagingCarousel.instance.index() === 9); + }); + PagingCarouselPrevButton.lu('getComponent','Button').ready(function() { + PagingCarousel.instance.select(9); + PagingCarouselNextButton.click(); + ok(PagingCarousel.instance.index() === 0); + start(); + }); }); } ); @@ -78,35 +113,18 @@ function execute(){ ok(SlidingCarousel.instance.hasPrevious() === true); SlidingCarousel.instance.trigger('previous'); ok(SlidingCarousel.instance.index() == 13); - start(); + + SlidingCarouselNextButton.lu('getComponent','Button').ready(function() { + SlidingCarousel.instance.select(0); + SlidingCarouselPrevButton.click(); + ok(SlidingCarousel.instance.index() === 13); + }); + SlidingCarouselPrevButton.lu('getComponent','Button').ready(function() { + SlidingCarousel.instance.select(13); + SlidingCarouselNextButton.click(); + ok(SlidingCarousel.instance.index() === 0); + start(); + }); }); } ); - - QUnit.asyncTest( 'buttons', function(){ - - // Paging list - PagingListNextButton.click(); - ok(PagingList.instance.index() === 5); - PagingListPrevButton.click(); - ok(PagingList.instance.index() === 0); - - // Sliding List - SlidingListNextButton.click(); - ok(SlidingList.instance.index() === 1); - SlidingListPrevButton.click(); - ok(SlidingList.instance.index() === 0); - - // Paging Carousel - PagingCarouselPrevButton.click(); - ok(PagingCarousel.instance.index() === 9); - PagingCarouselNextButton.click(); - ok(PagingCarousel.instance.index() === 0); - - // Sliding Carousel - SlidingCarouselPrevButton.click(); - ok(SlidingCarousel.instance.index() === 13); - SlidingCarouselNextButton.click(); - ok(SlidingCarousel.instance.index() === 0); - start(); - } ); } diff --git a/test/viewport/viewport.html b/test/viewport/viewport.html index d0faf32..528479d 100644 --- a/test/viewport/viewport.html +++ b/test/viewport/viewport.html @@ -215,7 +215,7 @@ Inject.setExpires( 0 ); Inject.clearCache(); - Inject.setModuleRoot( 'http://localhost:1337/' ); + Inject.setModuleRoot( 'http://ahuynh-mn:1337/' ); window.LU_DEBUG = 5; From 832ee79eae4329e445c13ddebc540738b0999731 Mon Sep 17 00:00:00 2001 From: Alvin Huynh Date: Mon, 19 Nov 2012 17:57:38 -0800 Subject: [PATCH 4/4] Fixed root dir config in the test viewport.html file --- test/viewport/viewport.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/viewport/viewport.html b/test/viewport/viewport.html index 528479d..d0faf32 100644 --- a/test/viewport/viewport.html +++ b/test/viewport/viewport.html @@ -215,7 +215,7 @@ Inject.setExpires( 0 ); Inject.clearCache(); - Inject.setModuleRoot( 'http://ahuynh-mn:1337/' ); + Inject.setModuleRoot( 'http://localhost:1337/' ); window.LU_DEBUG = 5;