From c9092a59c18c66406c9bb6255b34b07b8c29a043 Mon Sep 17 00:00:00 2001 From: Andras Toth Date: Mon, 1 Sep 2014 15:38:42 +0200 Subject: [PATCH] Fix header status --- www/waterfall_view/src/module/data/data.service.coffee | 6 ++++-- www/waterfall_view/src/module/data/data.service.spec.coffee | 5 ++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/www/waterfall_view/src/module/data/data.service.coffee b/www/waterfall_view/src/module/data/data.service.coffee index f7e6dfec797..e5a57f532a4 100644 --- a/www/waterfall_view/src/module/data/data.service.coffee +++ b/www/waterfall_view/src/module/data/data.service.coffee @@ -37,6 +37,8 @@ class Data extends Service for builder in builders latest = null for build in builder.builds - latest ?= build + latest = build if build.number > latest.number then latest = build - builder.results = latest?.results or 'pending' + builder.started_at = latest?.started_at + builder.complete = latest?.complete or false + builder.results = latest?.results diff --git a/www/waterfall_view/src/module/data/data.service.spec.coffee b/www/waterfall_view/src/module/data/data.service.spec.coffee index 55108714488..208b0dfff55 100644 --- a/www/waterfall_view/src/module/data/data.service.spec.coffee +++ b/www/waterfall_view/src/module/data/data.service.spec.coffee @@ -83,6 +83,5 @@ describe 'Data service', -> dataService.getGroups(builders, builds, 0) dataService.addStatus(builders) for builder in builders - expect(builder.results).toBeDefined() - # Working builder status is pending - expect(builders[2].results).toBe('pending') \ No newline at end of file + if builder.complete then expect(builder.results).toBeDefined() + else expect(builder.results).not.toBeDefined() \ No newline at end of file