runtest - moved after test cleanup to try finally

Author: mfeingold

test/BasicTestsSpec.js

@@ -161,7 +161,8 @@ describe('uiScroll', function () {
         it('should clip 3 divs from the top and add 3 more divs to the bottom (9 divs total) (+ 2 padding divs)', function () {
             runTest(scrollSettings,
                 function (viewport, scope, $timeout) {
-
+// padding calculations are different now, besides the specific number of elements clipped
+// is not that important and a test for cliptop/bottom methods of the viewport object is more appropriate
                     viewport.scrollTop(100);
                     viewport.trigger('scroll');
                     $timeout.flush();
@@ -246,6 +247,7 @@ describe('uiScroll', function () {
             inject(function (myMultipageDatasource) {
                 spy = spyOn(myMultipageDatasource, 'get').and.callThrough();
             });
+
             runTest(scrollSettings,
                 function (viewport, scope, $timeout) {
                     var flush = $timeout.flush;

test/scaffolding.js

@@ -18,20 +18,27 @@ var runTest = function (scrollSettings, run, options) {
     inject(function ($rootScope, $compile, $window, $timeout) {
             var scroller = angular.element(createHtml(scrollSettings));
             var scope = $rootScope.$new();
+
+            //if (angular.element(document).find('body').find('div').children().length)
+                //debugger
+
             angular.element(document).find('body').append(scroller);
 
             $compile(scroller)(scope);
 
             scope.$apply();
             $timeout.flush();
 
-            run(scroller, scope, $timeout);
+            try {
+                run(scroller, scope, $timeout);
+            } finally {
+                scroller.remove();
 
-            scroller.remove();
-
-            if (options && typeof options.cleanupTest === 'function') {
-                options.cleanupTest(scroller, scope, $timeout);
+                if (options && typeof options.cleanupTest === 'function') {
+                    options.cleanupTest(scroller, scope, $timeout);
+                }
             }
+
         }
     );
 };