suzanne.soy/travis-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'ps-ember-update' of github.com:travis-ci/travis-web into ps-ember-update

Browse Source
This commit is contained in:
Sven Fuchs 2013-02-28 21:38:08 +01:00
commit b1b16f9039
21 changed files with 83 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.travis.yml
View File

@ -4,6 +4,7 @@ rvm:
before_script:
- "gem install travis-artifacts"
- "bundle exec rakep"
- "phantomjs --version"
env:
global:

11
assets/scripts/app/controllers/builds.coffee
View File

@ -1,15 +1,18 @@
Travis.BuildsController = Em.ArrayController.extend
# sortAscending: false
sortAscending: false
sortProperties: ['number']
needs: ['repo']
repoBinding: 'controllers.repo.repo'
buildsBinding: 'controllers.repo.builds'
contentBinding: 'controllers.repo.builds'
tabBinding: 'controllers.repo.tab'
isLoadedBinding: 'content.isLoaded'
showMore: ->
id = @get('repo.id')
number = @get('builds.lastObject.number')
@get('builds').load Travis.Build.olderThanNumber(id, number, @get('tab'))
number = @get('lastObject.number')
@get('content').load Travis.Build.olderThanNumber(id, number, @get('tab'))
displayShowMoreButton: (->
@get('tab') != 'branches'

8
assets/scripts/app/controllers/repos.coffee
View File

@ -3,8 +3,14 @@ require 'travis/limited_array'
Travis.ReposController = Ember.ArrayController.extend
defaultTab: 'recent'
isLoadedBinding: 'content.isLoaded'
needs: ['currentUser']
needs: ['currentUser', 'repo']
currentUserBinding: 'controllers.currentUser'
selectedRepo: (->
# we need to observe also repo.content here, because we use
# ObjectProxy in repo controller
# TODO: get rid of ObjectProxy there
@get('controllers.repo.repo.content') || @get('controllers.repo.repo')
).property('controllers.repo.repo', 'controllers.repo.repo.content')
init: ->
Ember.run.later(@updateTimes.bind(this), Travis.INTERVALS.updateTimes)

2
assets/scripts/app/routes.coffee
View File

@ -2,7 +2,7 @@ require 'travis/location'
require 'travis/line_number_parser'
Ember.Router.reopen
location: (if testMode? then Ember.HashLocation.create() else Travis.Location.create())
location: (if testMode? then Ember.NoneLocation.create() else Travis.Location.create())
handleURL: (url) ->
url = url.replace(/#.*?$/, '')

4
assets/scripts/app/templates/builds/list.hbs
View File

@ -1,4 +1,4 @@
{{#if builds.isLoaded}}
{{#if content.isLoaded}}
<table id="builds" class="list">
<thead>
<tr>
@ -21,7 +21,7 @@
</thead>
<tbody>
{{#each build in builds}}
{{#each build in controller}}
{{#view Travis.BuildsItemView contextBinding="build"}}
<td class="number">
<span class="status"></span>

36
assets/scripts/app/templates/builds/show.hbs
View File

@ -16,25 +16,27 @@
<dd class="duration" {{bindAttr title="startedAt"}}>{{formatDuration build.duration}}</dd>
</div>
<div class="right">
<dt>{{t builds.commit}}</dt>
<dd class="commit"><a href="{{unbound urlGithubCommit}}">{{formatCommit build.commit}}</a></dd>
{{#if commit.compareUrl}}
<dt>{{t builds.compare}}</dt>
<dd class="compare"><a href="{{unbound commit.compareUrl}}">{{pathFrom build.commit.compareUrl}}</a></dd>
{{/if}}
{{#if commit.authorName}}
<dt>{{t builds.author}}</dt>
<dd class="author"><a href="{{unbound urlAuthor}}">{{build.commit.authorName}}</a></dd>
{{/if}}
{{#if commit.committerName}}
<dt>{{t builds.committer}}</dt>
<dd class="committer"><a href="{{unbound urlCommitter}}">{{build.commit.committerName}}</a></dd>
{{/if}}
</div>
{{#if commit}}
<div class="right">
<dt>{{t builds.commit}}</dt>
<dd class="commit"><a {{bindAttr href="urlGithubCommit"}}>{{formatCommit build.commit}}</a></dd>
{{#if commit.compareUrl}}
<dt>{{t builds.compare}}</dt>
<dd class="compare"><a {{bindAttr href="commit.compareUrl"}}>{{pathFrom build.commit.compareUrl}}</a></dd>
{{/if}}
{{#if commit.authorName}}
<dt>{{t builds.author}}</dt>
<dd class="author"><a {{bindAttr href="urlAuthor"}}>{{build.commit.authorName}}</a></dd>
{{/if}}
{{#if commit.committerName}}
<dt>{{t builds.committer}}</dt>
<dd class="committer"><a {{bindAttr href="urlCommitter"}}>{{build.commit.committerName}}</a></dd>
{{/if}}
</div>
{{/if}}
<dt>{{t builds.message}}</dt>
<dd class="message">{{{formatMessage build.commit.message}}}</dd>
<dd class="message">{{formatMessage build.commit.message}}</dd>
{{#unless isMatrix}}
<dt>{{t builds.config}}</dt>

2
assets/scripts/app/templates/repos/show.hbs
View File

@ -5,7 +5,7 @@
{{#if repo.isLoaded}}
{{#with repo}}
<h3>
<a {{bindAttr href="urlGithub"}}>{{slug}}</a>
<a {{bindAttr href="controller.urlGithub"}}>{{slug}}</a>
</h3>
<p class="description">{{description}}</p>

4
assets/scripts/app/views/repo/list.coffee
View File

@ -13,7 +13,9 @@
repoBinding: 'content'
classNames: ['repo']
classNameBindings: ['color', 'selected']
selectedBinding: 'repo.selected'
selected: (->
@get('content') == @get('controller.selectedRepo')
).property('controller.selectedRepo')
color: (->
Travis.Helpers.colorForState(@get('repo.lastBuildState'))

30
assets/scripts/spec/build_spec.coffee
View File

@ -1,13 +1,13 @@
describe 'on the "build" state', ->
beforeEach ->
app 'travis-ci/travis-core/builds/1'
app '/travis-ci/travis-core/builds/1'
console.log 'wait for repos'
waitFor reposRendered
runs ->
console.log 'wait for build'
waitFor buildRendered
afterEach ->
window.history.pushState({}, null, '/spec.html')
it 'displays the expected stuff', ->
listsRepos [
{ slug: 'travis-ci/travis-hub', build: { number: 4, url: '/travis-ci/travis-hub/builds/4', duration: '1 min', finishedAt: '-' } }
@ -52,14 +52,11 @@ describe 'on the "build" state', ->
describe 'on the "current" state', ->
beforeEach ->
app 'travis-ci/travis-core'
app '/travis-ci/travis-core'
waitFor reposRendered
runs ->
waitFor buildRendered
afterEach ->
window.history.pushState({}, null, '/spec.html')
it 'correctly updates values on pusher build:started event', ->
payload =
build:
@ -72,8 +69,8 @@ describe 'on the "current" state', ->
finished_at: '2012-07-02T00:02:55Z'
event_type: 'push'
result: 1
commit_message: 'commit message 3'
commit: '1234567'
message: 'commit message 3'
commit: 'foo1234'
state: 'started'
repository:
id: 1
@ -81,10 +78,19 @@ describe 'on the "current" state', ->
last_build_id: 11
Em.run ->
Travis.app.receive 'build:started', payload
Travis.receive 'build:started', payload
waits(100)
runs ->
displaysSummaryBuildLink '/travis-ci/travis-core/builds/11', '3'
displaysSummary
type: 'build'
id: 11
repo: 'travis-ci/travis-core'
commit: 'foo1234'
branch: 'master'
compare: '0123456..1234567'
finishedAt: 'less than a minute ago'
duration: '55 sec'
message: 'commit message 3'

5
assets/scripts/spec/builds_spec.coffee
View File

@ -1,11 +1,8 @@
describe 'on the "builds" state', ->
beforeEach ->
app 'travis-ci/travis-core/builds'
app '/travis-ci/travis-core/builds'
waitFor buildsRendered
afterEach ->
window.history.pushState({}, null, '/spec.html')
it 'displays the expected stuff', ->
listsRepos [
{ slug: 'travis-ci/travis-hub', build: { number: 4, url: '/travis-ci/travis-hub/builds/4', duration: '1 min', finishedAt: '-' } }

3
assets/scripts/spec/current_spec.coffee
View File

@ -3,9 +3,6 @@ describe 'on the "current" state', ->
app 'travis-ci/travis-core'
waitFor buildRendered
afterEach ->
window.history.pushState({}, null, '/spec.html')
it 'displays the expected stuff', ->
listsRepos [
{ slug: 'travis-ci/travis-hub', build: { number: 4, url: '/travis-ci/travis-hub/builds/4', duration: '1 min', finishedAt: '-' } }

3
assets/scripts/spec/event_spec.coffee
View File

@ -1,7 +1,4 @@
describe 'events', ->
afterEach ->
window.history.pushState({}, null, '/spec.html')
describe 'an event adding a repository', ->
beforeEach ->
app 'travis-ci/travis-core'

3
assets/scripts/spec/index_spec.coffee
View File

@ -3,9 +3,6 @@ describe 'on the "index" state', ->
app 'travis-ci/travis-core'
waitFor buildRendered
afterEach ->
window.history.pushState({}, null, '/spec.html')
it 'displays the expected stuff', ->
listsRepos [
{ slug: 'travis-ci/travis-hub', build: { number: 4, url: '/travis-ci/travis-hub/builds/4', duration: '1 min', finishedAt: '-' } }

3
assets/scripts/spec/job_spec.coffee
View File

@ -5,9 +5,6 @@ describe 'on the "job" state', ->
runs ->
waitFor hasText('#tab_build', 'Build #1')
afterEach ->
window.history.pushState({}, null, '/spec.html')
it 'displays the expected stuff', ->
listsRepos [
{ slug: 'travis-ci/travis-hub', build: { number: 4, url: '/travis-ci/travis-hub/builds/4', duration: '1 min', finishedAt: '-' } }

3
assets/scripts/spec/sidebar_spec.coffee
View File

@ -5,9 +5,6 @@ describe 'the sidebar', ->
runs ->
waitFor hasText('#tab_build', 'Build #1')
afterEach ->
window.history.pushState({}, null, '/spec.html')
it 'displays the expected stuff', ->
listsQueues [
{ name: 'common', item: { number: '5.1', repo: 'travis-ci/travis-core' } }

32
assets/scripts/spec/spec_helper.coffee
View File

@ -1,30 +1,14 @@
minispade.require 'app'
@reset = ->
Em.run ->
if Travis.app
if Travis.app.store
Travis.app.store.destroy()
Travis.app.destroy()
delete Travis.app
delete Travis.store
waits(500) # TODO not sure what we need to wait for here
$('#application').remove()
$('body').append( $('<div id="application"></div>') )
@app = (url) ->
reset()
Em.run ->
Travis.run(rootElement: $('#application'))
waitFor -> Travis.app
# TODO: so much waiting here, I'm sure we can minimize this
runs ->
url = "/#{url}" if url && !url.match(/^\//)
Travis.app.router.route(url)
waits 500
runs ->
foo = 'bar'
# TODO: this should wait till app is initialized, not some
# arbitrary amount of time
waits(50)
runs ->
Travis.reset()
url = "/#{url}" unless url.match /^\//
Travis.__container__.lookup('router:main').handleURL(url)
_Date = Date
@Date = (date) ->

10
assets/scripts/spec/support/mocks.coffee
View File

@ -7,9 +7,9 @@ repos = [
]
builds = [
{ id: 1, repository_id: '1', commit_id: 1, job_ids: [1, 2, 3], number: 1, pull_request: false, config: { rvm: ['rbx', '1.9.3', 'jruby'] }, duration: 30, started_at: '2012-07-02T00:00:00Z', finished_at: '2012-07-02T00:00:30Z', result: 0 },
{ id: 1, repository_id: '1', commit_id: 1, job_ids: [1, 2, 3], number: 1, pull_request: false, config: { rvm: ['rbx', '1.9.3', 'jruby'] }, duration: 30, started_at: '2012-07-02T00:00:00Z', finished_at: '2012-07-02T00:00:30Z', state: 'passed' },
{ id: 2, repository_id: '1', commit_id: 2, job_ids: [4], number: 2, pull_request: false, config: { rvm: ['rbx'] } },
{ id: 3, repository_id: '2', commit_id: 3, job_ids: [5], number: 3, pull_request: false, config: { rvm: ['rbx'] }, duration: 30, started_at: '2012-07-02T00:01:00Z', finished_at: '2012-07-01T00:01:30Z', result: 1 },
{ id: 3, repository_id: '2', commit_id: 3, job_ids: [5], number: 3, pull_request: false, config: { rvm: ['rbx'] }, duration: 30, started_at: '2012-07-02T00:01:00Z', finished_at: '2012-07-01T00:01:30Z', state: 'failed' },
{ id: 4, repository_id: '3', commit_id: 4, job_ids: [6], number: 4, pull_request: false, config: { rvm: ['rbx'] }, started_at: '2012-07-02T00:02:00Z' },
]
@ -21,11 +21,11 @@ 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', result: 0 }
{ 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', result: 1 }
{ 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', result: 1 }
{ 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.common' }
{ id: 8, repository_id: 1, build_id: 5, commit_id: 5, log_id: 8, number: '5.2', config: { rvm: 'rbx' }, state: 'created', queue: 'builds.common' }

6
assets/scripts/travis.coffee
View File

@ -32,6 +32,12 @@ window.Travis = Em.Application.extend(Ember.Evented,
@set('auth', Travis.Auth.create(app: this, endpoint: Travis.config.api_endpoint))
reset: ->
@store.destroy()
@setup()
@_super.apply(this, arguments);
storeAfterSignInPath: (path) ->
@get('auth').storeAfterSignInPath(path)

3
assets/styles/layout.sass
View File

@ -14,6 +14,7 @@ html, body
height: 100%
.application
position: relative
width: 100%
min-height: 100%
margin-top: 40px
@ -23,7 +24,7 @@ html, body
#top
position: absolute
top: 0
top: -40px
left: 0
width: 100%
height: 40px

1
public/spec.html
View File

@ -13,6 +13,7 @@
<script>
window.testMode = true;
minispade.require('travis')
Travis.advanceReadiness()
</script>
<script src="/scripts/specs.js"></script>

6
public/styles/jasmine-ext.css
View File

@ -1,9 +1,5 @@
#HTMLReporter {
position: absolute;
top: 10px;
right: 10px;
width: 50%;
height: 150px;
height: 400px;
z-index: 1000;
background-color: white;
overflow: auto;