Merge commit 'ab2f5cb410da5265723a78206e32a55c3dca86cd' into unit_test

.travis.yml

@@ -71,10 +71,6 @@ install:
   - (cd pkg;    python setup.py develop)
   - (cd master; python setup.py develop)
   - (cd slave;  python setup.py develop)
-  - (cd www;    python setup.py develop)
-  - (cd www/console_view;    python setup.py develop)
-  - (cd www/waterfall_view;    python setup.py develop)
-  - (cd www/codeparameter;    python setup.py develop)
   # mock is preinstalled on Travis
   # txgithub requires Twisted >= 12.3.0
   - pip install txgithub
@@ -107,6 +103,7 @@ script:
   - "[ $IS_LATEST = false ] || make pyflakes"
   - "[ $IS_LATEST = false ] || make docs"
   - "[ $IS_LATEST = false ] || make pep8"
+  - "[ $IS_LATEST = false ] || make frontend
 
 notifications:
   email: false

Makefile

@@ -17,7 +17,7 @@ pyflakes:
 	pyflakes master/buildbot slave/buildslave
 
 pep8:
-	pep8 --config=common/pep8rc master/buildbot slave/buildslave www/buildbot_*/ www/setup.py www/*/buildbot_*/ www/*/setup.py
+	pep8 --config=common/pep8rc master/buildbot slave/buildslave www/*/buildbot_*/ www/*/setup.py
 
-gruntci:
-	cd www; node_modules/.bin/grunt ci
+frontend:
+	for i in www/*/; do pip install -e $$i ; done

common/validate.sh

@@ -109,7 +109,7 @@ echo "${MAGENTA}Validating the following commits:${NORM}"
 git log "$REVRANGE" --pretty=oneline || exit 1
 
 if $slow; then
-    for module in www www/console_view www/waterfall_view www/codeparameter;
+    for module in www/base www/console_view www/waterfall_view www/codeparameter;
     do
         status "running 'setup.py develop' for $module"
         (cd $module; python setup.py develop >/dev/null    ) || not_ok "$module/setup.py failed"

www/.gitignore

@@ -3,6 +3,7 @@ build
 !src/app/builders/build
 dist/
 static/
+coverage/
 VERSION
 node_modules
 npm-debug.log

www/waterfall_view/package.json

@@ -5,6 +5,6 @@
         "npm": ">=1.4.10"
     },
     "devDependencies": {
-        "guanlecoja": "0.2.7"
+        "guanlecoja": "0.2.9"
     }
 }

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 or 'pending'
+            builder.results = latest?.results or 'pending'

www/waterfall_view/src/module/main.module.coffee

@@ -75,13 +75,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

www/waterfall_view/src/module/main.module.spec.coffee

@@ -25,6 +25,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)
 

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)
+                    .range(builders.map (builder) -> builder.name)