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

Merge branch 'master' of github.com:travis-ci/travis-web

Browse Source
This commit is contained in:
Lisa Passing 2015-02-26 11:39:19 +01:00
commit a5cc2dd099
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/repo-actions.coffee
View File

@ -84,7 +84,7 @@ View = BasicView.extend
canRequeueBuild: (-> canRequeueBuild: (->
@get('displayRequeueBuild') && @get('hasPermission') @get('displayRequeueBuild') && @get('hasPermission')
).property('displayRequireBuild', 'hasPermission') ).property('displayRequeueBuild', 'hasPermission')
displayRequeueJob: (-> displayRequeueJob: (->
@get('isJobTab') && @get('job.isFinished') @get('isJobTab') && @get('job.isFinished')

20
tests/unit/utils/favicon-manager-test.coffee
View File

@ -25,9 +25,13 @@ test 'set favicon if there is no link tag in head', ->
link = fakeHead.find('link')[0] link = fakeHead.find('link')[0]
ok link, 'link tag should be added by favicon manager' ok link, 'link tag should be added by favicon manager'
equal link.getAttribute('href'), 'foobar', 'href attribute for the link should be properly set' stop()
equal link.getAttribute('rel'), 'icon', 'rel attribute for the link should be properly set' setTimeout ->
equal link.getAttribute('type'), 'image/png', 'type attribute for the link should be properly set' start()
equal link.getAttribute('href'), 'foobar', 'href attribute for the link should be properly set'
equal link.getAttribute('rel'), 'icon', 'rel attribute for the link should be properly set'
equal link.getAttribute('type'), 'image/png', 'type attribute for the link should be properly set'
, 20
test 'replace exisiting link tag', -> test 'replace exisiting link tag', ->
fakeHead.append($('<link id="foo" rel="icon"></link>')) fakeHead.append($('<link id="foo" rel="icon"></link>'))
@ -42,9 +46,13 @@ test 'replace exisiting link tag', ->
link = links[0] link = links[0]
ok !link.getAttribute('id'), 'existing link should be replaced with a new one' ok !link.getAttribute('id'), 'existing link should be replaced with a new one'
equal link.getAttribute('href'), 'foobar', 'href attribute for the link should be properly set' stop()
equal link.getAttribute('rel'), 'icon', 'rel attribute for the link should be properly set' setTimeout ->
equal link.getAttribute('type'), 'image/png', 'type attribute for the link should be properly set' start()
equal link.getAttribute('href'), 'foobar', 'href attribute for the link should be properly set'
equal link.getAttribute('rel'), 'icon', 'rel attribute for the link should be properly set'
equal link.getAttribute('type'), 'image/png', 'type attribute for the link should be properly set'
, 20
test 'find link with rel=icon only', -> test 'find link with rel=icon only', ->
fakeHead.append($('<link id="foo" rel="foo"></link>')) fakeHead.append($('<link id="foo" rel="foo"></link>'))