diff --git a/assets/scripts/app/routes.coffee b/assets/scripts/app/routes.coffee index d2536d66..cea215ed 100644 --- a/assets/scripts/app/routes.coffee +++ b/assets/scripts/app/routes.coffee @@ -220,6 +220,9 @@ Travis.BuildRoute = Ember.Route.extend @controllerFor('build').set('build', model) repo.set('build', model) + model: (params) -> + Travis.Build.find(params.build_id) + Travis.JobRoute = Ember.Route.extend renderTemplate: -> @render 'job', outlet: 'pane', into: 'repo' @@ -246,6 +249,9 @@ Travis.JobRoute = Ember.Route.extend model.removeObserver('build', buildObserver) model.addObserver('build', this, buildObserver) + model: (params) -> + Travis.Job.find(params.job_id) + Travis.RepoIndexRoute = Ember.Route.extend Travis.SetupLastBuild, setupController: (controller, model) -> @_super.apply this, arguments diff --git a/assets/scripts/spec/integration/current_spec.coffee b/assets/scripts/spec/integration/current_spec.coffee index 87d2ad83..082f6189 100644 --- a/assets/scripts/spec/integration/current_spec.coffee +++ b/assets/scripts/spec/integration/current_spec.coffee @@ -5,7 +5,7 @@ module "Repo page", Ember.run -> Travis.reset() test "displaying information on repo page", -> - visit('travis-ci/travis-core').then -> + visit('/travis-ci/travis-core').then -> listsRepos [ { slug: 'travis-ci/travis-hub', build: { number: 4, url: '/travis-ci/travis-hub/builds/4', duration: '1 min', finishedAt: '-' } } { slug: 'travis-ci/travis-core', build: { number: 1, url: '/travis-ci/travis-core/builds/1', duration: '30 sec', finishedAt: '3 minutes ago' } } diff --git a/assets/scripts/spec/integration/event_spec.coffee b/assets/scripts/spec/integration/event_spec.coffee index 92f49f6e..79dbc332 100644 --- a/assets/scripts/spec/integration/event_spec.coffee +++ b/assets/scripts/spec/integration/event_spec.coffee @@ -5,7 +5,7 @@ module "Events", Ember.run -> Travis.reset() test "event containing a repository, adds repository to repos list", -> - visit('travis-ci/travis-core').then -> + visit('/travis-ci/travis-core').then -> payload = repository: id: 10 @@ -36,7 +36,7 @@ test "event containing a repository, adds repository to repos list", -> item: { slug: 'travis-ci/travis-support', build: { number: 4, url: '/travis-ci/travis-support/builds/10', duration: '1 min 30 sec', finishedAt: 'less than a minute ago' } } test "an event with a build adds a build to a builds list", -> - visit('travis-ci/travis-core/builds').then -> + visit('/travis-ci/travis-core/builds').then -> payload = build: id: 11 diff --git a/assets/scripts/spec/integration/index_spec.coffee b/assets/scripts/spec/integration/index_spec.coffee index 509217f6..ea19cdb6 100644 --- a/assets/scripts/spec/integration/index_spec.coffee +++ b/assets/scripts/spec/integration/index_spec.coffee @@ -5,7 +5,7 @@ module "Index page", Ember.run -> Travis.reset() test "displaying information on index page", -> - visit('travis-ci/travis-core').then -> + visit('/travis-ci/travis-core').then -> listsRepos [ { slug: 'travis-ci/travis-hub', build: { number: 4, url: '/travis-ci/travis-hub/builds/4', duration: '1 min', finishedAt: '-' } } { slug: 'travis-ci/travis-core', build: { number: 1, url: '/travis-ci/travis-core/builds/1', duration: '30 sec', finishedAt: '3 minutes ago' } } diff --git a/assets/scripts/spec/integration/job_spec.coffee b/assets/scripts/spec/integration/job_spec.coffee index 58081097..ccd07b2f 100644 --- a/assets/scripts/spec/integration/job_spec.coffee +++ b/assets/scripts/spec/integration/job_spec.coffee @@ -11,7 +11,7 @@ test 'displaying information on job page', -> responseTime: 0 responseText: "First line\ncontent:travis_fold:start:install\r$ Install something\nInstalling something\ncontent:travis_fold:end:install\r$ End" - visit('travis-ci/travis-core/jobs/1').then -> + visit('/travis-ci/travis-core/jobs/1').then -> listsRepos [ { slug: 'travis-ci/travis-hub', build: { number: 4, url: '/travis-ci/travis-hub/builds/4', duration: '1 min', finishedAt: '-' } } { slug: 'travis-ci/travis-core', build: { number: 1, url: '/travis-ci/travis-core/builds/1', duration: '30 sec', finishedAt: '3 minutes ago' } } diff --git a/assets/scripts/travis.coffee b/assets/scripts/travis.coffee index 6d965e78..5db8ece5 100644 --- a/assets/scripts/travis.coffee +++ b/assets/scripts/travis.coffee @@ -63,7 +63,6 @@ Ember.RecordArray.reopen window.Travis = TravisApplication.create( LOG_TRANSITIONS: true ) -Travis.deferReadiness() $.extend Travis, run: ->