From 46643e8315969516470b9b29c7dea18a3403e55a Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Thu, 14 Mar 2013 18:01:10 +0100 Subject: [PATCH 1/4] Run Travis.Repo.find() before using recent repos Becuase we use filter() now to get just the repos with the last build into the sidebar, it will not fetch the request automatically. --- assets/scripts/app/controllers/repos.coffee | 1 + 1 file changed, 1 insertion(+) diff --git a/assets/scripts/app/controllers/repos.coffee b/assets/scripts/app/controllers/repos.coffee index 88b1ad60..cfc0c0da 100644 --- a/assets/scripts/app/controllers/repos.coffee +++ b/assets/scripts/app/controllers/repos.coffee @@ -17,6 +17,7 @@ Travis.ReposController = Ember.ArrayController.extend Ember.run.later(@updateTimes.bind(this), Travis.INTERVALS.updateTimes) recentRepos: (-> + Travis.Repo.find() Travis.LimitedArray.create content: Em.ArrayProxy.extend(Em.SortableMixin).create( sortProperties: ['sortOrder'] From 3e3bb975917d3aed294d2ede53a95c9639a58b5d Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Thu, 14 Mar 2013 18:29:53 +0100 Subject: [PATCH 2/4] Clean lineNumber on transitions --- assets/scripts/app/routes.coffee | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/assets/scripts/app/routes.coffee b/assets/scripts/app/routes.coffee index 4bab2d5b..2318158d 100644 --- a/assets/scripts/app/routes.coffee +++ b/assets/scripts/app/routes.coffee @@ -38,6 +38,13 @@ Ember.Route.reopen Travis.storeAfterSignInPath(path) @transitionTo('auth') +Travis.Router.reopen + transitionTo: -> + this.container.lookup('controller:repo').set('lineNumber', null) + + @_super.apply this, arguments + + Travis.Router.map -> @resource 'index', path: '/', -> @route 'current', path: '/' From 80317050ff2988aac6a990e8bfede8ee9ae62b4b Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Thu, 14 Mar 2013 19:59:20 +0100 Subject: [PATCH 3/4] Fix specs --- assets/scripts/spec/event_spec.coffee | 1 + assets/scripts/spec/support/mocks.coffee | 16 ++++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/assets/scripts/spec/event_spec.coffee b/assets/scripts/spec/event_spec.coffee index 380a007e..ddde0844 100644 --- a/assets/scripts/spec/event_spec.coffee +++ b/assets/scripts/spec/event_spec.coffee @@ -92,6 +92,7 @@ describe 'events', -> job: id: 12 repository_id: 1 + repository_slug: 'travis-ci/travis-core' number: '1.4' queue: 'builds.linux' state: 'created' diff --git a/assets/scripts/spec/support/mocks.coffee b/assets/scripts/spec/support/mocks.coffee index b8c1587d..ea256dab 100644 --- a/assets/scripts/spec/support/mocks.coffee +++ b/assets/scripts/spec/support/mocks.coffee @@ -21,14 +21,14 @@ commits = [ ] jobs = [ - { id: '1', repository_id: 1, build_id: 1, commit_id: 1, log_id: 1, number: '1.1', config: { rvm: 'rbx' }, duration: 30, started_at: '2012-07-02T00:00:00Z', finished_at: '2012-07-02T00:00:30Z', state: 'passed' } - { id: '2', repository_id: 1, build_id: 1, commit_id: 1, log_id: 2, number: '1.2', config: { rvm: '1.9.3' }, duration: 40, started_at: '2012-07-02T00:00:00Z', finished_at: '2012-07-02T00:00:40Z', state: 'failed' } - { id: '3', repository_id: 1, build_id: 1, commit_id: 1, log_id: 3, number: '1.3', config: { rvm: 'jruby' }, allow_failure: true } - { id: '4', repository_id: 1, build_id: 2, commit_id: 2, log_id: 4, number: '2.1', config: { rvm: 'rbx' } } - { id: '5', repository_id: 2, build_id: 3, commit_id: 3, log_id: 5, number: '3.1', config: { rvm: 'rbx' }, duration: 30, started_at: '2012-07-02T00:01:00Z', finished_at: '2012-07-02T00:01:30Z', state: 'failed' } - { id: '6', repository_id: 3, build_id: 4, commit_id: 4, log_id: 6, number: '4.1', config: { rvm: 'rbx' }, started_at: '2012-07-02T00:02:00Z' } - { id: '7', repository_id: 1, build_id: 5, commit_id: 5, log_id: 7, number: '5.1', config: { rvm: 'rbx' }, state: 'created', queue: 'builds.linux' } - { id: '8', repository_id: 1, build_id: 5, commit_id: 5, log_id: 8, number: '5.2', config: { rvm: 'rbx' }, state: 'created', queue: 'builds.linux' } + { id: '1', repository_id: 1, repository_slug: 'travis-ci/travis-core', build_id: 1, commit_id: 1, log_id: 1, number: '1.1', config: { rvm: 'rbx' }, duration: 30, started_at: '2012-07-02T00:00:00Z', finished_at: '2012-07-02T00:00:30Z', state: 'passed' } + { id: '2', repository_id: 1, repository_slug: 'travis-ci/travis-core', build_id: 1, commit_id: 1, log_id: 2, number: '1.2', config: { rvm: '1.9.3' }, duration: 40, started_at: '2012-07-02T00:00:00Z', finished_at: '2012-07-02T00:00:40Z', state: 'failed' } + { id: '3', repository_id: 1, repository_slug: 'travis-ci/travis-core', build_id: 1, commit_id: 1, log_id: 3, number: '1.3', config: { rvm: 'jruby' }, allow_failure: true } + { id: '4', repository_id: 1, repository_slug: 'travis-ci/travis-core', build_id: 2, commit_id: 2, log_id: 4, number: '2.1', config: { rvm: 'rbx' } } + { id: '5', repository_id: 2, repository_slug: 'travis-ci/travis-assets', build_id: 3, commit_id: 3, log_id: 5, number: '3.1', config: { rvm: 'rbx' }, duration: 30, started_at: '2012-07-02T00:01:00Z', finished_at: '2012-07-02T00:01:30Z', state: 'failed' } + { id: '6', repository_id: 3, repository_slug: 'travis-ci/travis-hub', build_id: 4, commit_id: 4, log_id: 6, number: '4.1', config: { rvm: 'rbx' }, started_at: '2012-07-02T00:02:00Z' } + { id: '7', repository_id: 1, repository_slug: 'travis-ci/travis-core', build_id: 5, commit_id: 5, log_id: 7, number: '5.1', config: { rvm: 'rbx' }, state: 'created', queue: 'builds.linux' } + { id: '8', repository_id: 1, repository_slug: 'travis-ci/travis-core', build_id: 5, commit_id: 5, log_id: 8, number: '5.2', config: { rvm: 'rbx' }, state: 'created', queue: 'builds.linux' } ] artifacts = [ From febf40fd760bc2e571d178492ee5135661a5056d Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Thu, 14 Mar 2013 20:37:57 +0100 Subject: [PATCH 4/4] Fix pull requests view to show PR number --- assets/scripts/app/views/build.coffee | 2 ++ 1 file changed, 2 insertions(+) diff --git a/assets/scripts/app/views/build.coffee b/assets/scripts/app/views/build.coffee index 12749afc..9b2ed95d 100644 --- a/assets/scripts/app/views/build.coffee +++ b/assets/scripts/app/views/build.coffee @@ -30,6 +30,8 @@ Travis.reopen buildBinding: 'context' commitBinding: 'build.commit' + isPullRequestsList: ( -> @get('parentView.isPullRequestsList') ).property('parentView.isPullRequestsList') + color: (-> Travis.Helpers.colorForState(@get('build.state')) ).property('build.state')