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

Fix specs

Browse Source
This commit is contained in:
Piotr Sarnacki 2013-03-14 15:43:19 +01:00
parent 0fe82d050a
commit 296bff56f1
7 changed files with 42 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
assets/scripts/app/templates/repos/show/tabs.hbs
View File

@ -37,24 +37,24 @@
</li>
<li id="tab_build" {{bindAttr class="view.classBuild"}}>
<h5>
{{#with view.build}}
{{#if repo.slug}}
{{#linkTo "build" repo this}}
{{t repositories.tabs.build}} #{{number}}
{{#if view.build.id}}
{{#if view.build.repo.slug}}
{{#linkTo "build" view.build.repo view.build}}
{{t repositories.tabs.build}} #{{view.build.number}}
{{/linkTo}}
{{/if}}
{{/with}}
{{/if}}
</h5>
</li>
<li id="tab_job" {{bindAttr class="view.classJob"}}>
<h5>
{{#with view.job}}
{{#if repo.slug}}
{{#linkTo "job" repo this}}
{{t repositories.tabs.job}} #{{number}}
{{#if view.job.id}}
{{#if view.job.repo.slug}}
{{#linkTo "job" view.job.repo view.job}}
{{t repositories.tabs.job}} #{{view.job.number}}
{{/linkTo}}
{{/if}}
{{/with}}
{{/if}}
</h5>
</li>
</ul>

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

@ -70,9 +70,9 @@ describe 'events', ->
describe 'an event adding a job', ->
beforeEach ->
app 'travis-ci/travis-core'
waitFor jobsRendered
waitFor jobsRendered, 'jobs should be rendered'
runs ->
waitFor queuesRendered
waitFor queuesRendered, 'queues should be rendered'
it 'adds a job to the jobs queue', ->
payload =
@ -80,7 +80,7 @@ describe 'events', ->
id: 12
repository_id: 1
number: '1.4'
queue: 'builds.common'
queue: 'builds.linux'
$.mockjax
url: '/jobs/12'
@ -93,13 +93,13 @@ describe 'events', ->
id: 12
repository_id: 1
number: '1.4'
queue: 'builds.common'
queue: 'builds.linux'
state: 'created'
waits(100)
waits(1000)
runs ->
listsQueuedJob
name: 'common'
name: 'linux'
row: 3
item: { number: '1.4', repo: 'travis-ci/travis-core' }

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

@ -18,28 +18,28 @@ describe 'on the "job" state', ->
{ slug: 'travis-ci/travis-assets', build: { number: 3, url: '/travis-ci/travis-assets/builds/3', duration: '30 sec', finishedAt: 'a day ago' } }
]
displaysRepository
href: 'http://github.com/travis-ci/travis-core'
displaysSummary
id: 1
type: 'job'
repo: 'travis-ci/travis-core'
commit: '1234567'
branch: 'master'
compare: '0123456..1234567'
finishedAt: '3 minutes ago'
duration: '30 sec'
message: 'commit message 1'
displaysTabs
current: { href: '/travis-ci/travis-core' }
builds: { href: '/travis-ci/travis-core/builds' }
build: { href: '/travis-ci/travis-core/builds/1' }
job: { href: '/travis-ci/travis-core/jobs/1', active: true }
waits 30
waits 100
runs ->
displaysRepository
href: 'http://github.com/travis-ci/travis-core'
displaysSummary
id: 1
type: 'job'
repo: 'travis-ci/travis-core'
commit: '1234567'
branch: 'master'
compare: '0123456..1234567'
finishedAt: '3 minutes ago'
duration: '30 sec'
message: 'commit message 1'
displaysTabs
current: { href: '/travis-ci/travis-core' }
builds: { href: '/travis-ci/travis-core/builds' }
build: { href: '/travis-ci/travis-core/builds/1' }
job: { href: '/travis-ci/travis-core/jobs/1', active: true }
displaysLog [
'log 1'
]

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

@ -7,6 +7,6 @@ describe 'the sidebar', ->
it 'displays the expected stuff', ->
listsQueues [
{ name: 'common', item: { number: '5.1', repo: 'travis-ci/travis-core' } }
{ name: 'common', item: { number: '5.2', repo: 'travis-ci/travis-core' } }
{ name: 'linux', item: { number: '5.1', repo: 'travis-ci/travis-core' } }
{ name: 'linux', item: { number: '5.2', repo: 'travis-ci/travis-core' } }
]

2
assets/scripts/spec/support/conditions.coffee
View File

@ -9,6 +9,6 @@
@buildsRendered = notEmpty('#builds .number')
@jobRendered = notEmpty('#summary .number')
@jobsRendered = notEmpty('#jobs .number')
@queuesRendered = notEmpty('#queue_common li')
@queuesRendered = notEmpty('#queue_linux li')
@workersRendered = notEmpty('.worker')

1
assets/scripts/spec/support/helpers.coffee
View File

@ -8,4 +8,3 @@
@waitFor = waitsFor

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

@ -27,8 +27,8 @@ jobs = [
{ 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.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' }
{ 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' }
]
artifacts = [