From 1ff21c64823412de345fe2908fe062e6cd11b82e Mon Sep 17 00:00:00 2001
From: Pierre Tardy <pierre.tardy@intel.com>
Date: Fri, 15 Aug 2014 20:32:17 +0200
Subject: [PATCH] update waterfall for coverage

Signed-off-by: Pierre Tardy <pierre.tardy@intel.com>
---
 www/.gitignore                                           | 1 +
 www/waterfall_view/package.json                          | 2 +-
 www/waterfall_view/src/module/data/data.service.coffee   | 4 +++-
 www/waterfall_view/src/module/main.module.coffee         | 4 ++--
 www/waterfall_view/src/module/main.module.spec.coffee    | 1 +
 www/waterfall_view/src/module/scale/scale.service.coffee | 4 ++--
 6 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/www/.gitignore b/www/.gitignore
index f5834e864dd..1f88e3c01e3 100644
--- a/www/.gitignore
+++ b/www/.gitignore
@@ -3,6 +3,7 @@ build
 !src/app/builders/build
 dist/
 static/
+coverage/
 VERSION
 node_modules
 npm-debug.log
diff --git a/www/waterfall_view/package.json b/www/waterfall_view/package.json
index 4f464d87a0b..aa2b742575b 100644
--- a/www/waterfall_view/package.json
+++ b/www/waterfall_view/package.json
@@ -5,6 +5,6 @@
         "npm": ">=1.4.10"
     },
     "devDependencies": {
-        "guanlecoja": "0.2.7"
+        "guanlecoja": "0.2.9"
     }
 }
diff --git a/www/waterfall_view/src/module/data/data.service.coffee b/www/waterfall_view/src/module/data/data.service.coffee
index 870046d1b2a..7d2b1281f52 100644
--- a/www/waterfall_view/src/module/data/data.service.coffee
+++ b/www/waterfall_view/src/module/data/data.service.coffee
@@ -1,4 +1,6 @@
 class Data extends Service
+    constructor: ->
+        {}
     # Returns groups and adds builds to builders
     getGroups: (builders, builds, threshold) ->
         # Sort builds by buildid
@@ -37,4 +39,4 @@ class Data extends Service
             for build in builder.builds
                 latest ?= build
                 if build.number > latest.number then latest = build
-            builder.results = latest?.results
\ No newline at end of file
+            builder.results = latest?.results
diff --git a/www/waterfall_view/src/module/main.module.coffee b/www/waterfall_view/src/module/main.module.coffee
index cc84090878d..98cb9b0485a 100644
--- a/www/waterfall_view/src/module/main.module.coffee
+++ b/www/waterfall_view/src/module/main.module.coffee
@@ -73,13 +73,13 @@ class Waterfall extends Controller
             angular.element(@$window).bind 'resize', => @render()
 
             # Update view on data change
-            @$scope.$watch 'builds', (builds) =>
+            @$scope.$watch('builds', ((builds) =>
                 if builds? and @builds.length isnt builds.length
                     @builds = builds
                     @groups = @dataService.getGroups(@builders, @builds, @c.threshold)
                     @dataService.addStatus(@builders)
                     @render()
-            , true
+                ), true)
 
             # Lazy load builds on scroll
             containerParent = @container.node().parentNode
diff --git a/www/waterfall_view/src/module/main.module.spec.coffee b/www/waterfall_view/src/module/main.module.spec.coffee
index 191a67a4e7d..84bd87256c9 100644
--- a/www/waterfall_view/src/module/main.module.spec.coffee
+++ b/www/waterfall_view/src/module/main.module.spec.coffee
@@ -20,6 +20,7 @@ describe 'Waterfall view controller', ->
 
     # make sure we remove the element from the dom
     afterEach ->
+        expect($document.find("svg").length).toEqual(2)
         elem.remove()
         expect($document.find("svg").length).toEqual(0)
 
diff --git a/www/waterfall_view/src/module/scale/scale.service.coffee b/www/waterfall_view/src/module/scale/scale.service.coffee
index 0a74a11f54e..b87a074f1b1 100644
--- a/www/waterfall_view/src/module/scale/scale.service.coffee
+++ b/www/waterfall_view/src/module/scale/scale.service.coffee
@@ -7,7 +7,7 @@ class ScaleService extends Factory
             getX: (builders, width) ->
                 @d3.scale.ordinal()
                     .domain(builders.map (builder) -> builder.builderid)
-                    .rangeRoundBands([0, width], .1)
+                    .rangeRoundBands([0, width], 0.1)
 
             # Returns y scale
             getY: (groups, gap, height) ->
@@ -46,4 +46,4 @@ class ScaleService extends Factory
             getBuilderName: (builders) ->
                 @d3.scale.ordinal()
                     .domain(builders.map (builder) -> builder.builderid)
-                    .range(builders.map (builder) -> builder.name)
\ No newline at end of file
+                    .range(builders.map (builder) -> builder.name)