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:
Sven Fuchs 2012-07-05 00:22:58 +02:00
parent 0224522aeb
commit 4de9a4b9fc
8 changed files with 107 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
assets/javascripts/app/templates/jobs/list.hbs
View File

@ -1,13 +1,16 @@
{{#if view.jobs.length}} {{#if view.jobs.length}}
<table id="jobs" class="list"> {{#if view.required}}
<caption> <table id="jobs" class="list">
{{#if view.required}} <caption>
{{t jobs.build_matrix}} {{t jobs.build_matrix}}
{{else}} </caption>
{{t jobs.allowed_failures}} {{else}}
<a title="What's this?" class="help" {{action toggleHelp}}></a> <table id="allowed_failure_jobs" class="list">
{{/if}} <caption>
</caption> {{t jobs.allowed_failures}}
<a title="What's this?" class="help" {{action toggleHelp}}></a>
</caption>
{{/if}}
<thead> <thead>
<tr> <tr>
{{#each configKeys}} {{#each configKeys}}

34
assets/javascripts/spec/current_spec.coffee
View File

@ -1,4 +1,4 @@
xdescribe 'The current build tab', -> describe 'The current build tab', ->
describe 'on the "index" state', -> describe 'on the "index" state', ->
beforeEach -> beforeEach ->
app '' app ''
@ -15,12 +15,20 @@ xdescribe 'The current build tab', ->
message: 'commit message 1' message: 'commit message 1'
describe 'given the current build has a job matrix', -> describe 'given the current build has a job matrix', ->
it 'displays the build matrix table', -> it 'displays the jobs matrix table', ->
displaysBuildMatrix displaysJobMatrix
element: '#jobs'
headers: ['Job', 'Duration', 'Finished', 'Rvm'] headers: ['Job', 'Duration', 'Finished', 'Rvm']
jobs: [ jobs: [
{ id: 1, number: '#1.1', repo: 'travis-ci/travis-core', finishedAt: /\d+ (\w+) ago/, duration: '35 sec', rvm: 'rbx' }, { id: 1, number: '1.1', repo: 'travis-ci/travis-core', finishedAt: /\d+ (\w+) ago/, duration: '35 sec', rvm: 'rbx' },
{ id: 2, number: '#1.2', repo: 'travis-ci/travis-core', finishedAt: '-', duration: '-', rvm: '1.9.3' } ]
it 'displays the allowed failure jobs matrix table', ->
displaysJobMatrix
element: '#allowed_failure_jobs'
headers: ['Job', 'Duration', 'Finished', 'Rvm']
jobs: [
{ id: 2, number: '1.2', repo: 'travis-ci/travis-core', finishedAt: '-', duration: '-', rvm: '1.9.3' }
] ]
describe 'on the "current" state', -> describe 'on the "current" state', ->
@ -40,10 +48,18 @@ xdescribe 'The current build tab', ->
message: 'commit message 1' message: 'commit message 1'
describe 'given the current build has a job matrix', -> describe 'given the current build has a job matrix', ->
it 'displays the build matrix table', -> it 'displays the jobs matrix table', ->
displaysBuildMatrix displaysJobMatrix
element: '#jobs'
headers: ['Job', 'Duration', 'Finished', 'Rvm'] headers: ['Job', 'Duration', 'Finished', 'Rvm']
jobs: [ jobs: [
{ id: 1, number: '#1.1', repo: 'travis-ci/travis-core', finishedAt: /\d+ (\w+) ago/, duration: '35 sec', rvm: 'rbx' }, { id: 1, number: '1.1', repo: 'travis-ci/travis-core', finishedAt: /\d+ (\w+) ago/, duration: '35 sec', rvm: 'rbx' },
{ id: 2, number: '#1.2', repo: 'travis-ci/travis-core', finishedAt: '-', duration: '-', rvm: '1.9.3' } ]
it 'displays the allowed failure jobs matrix table', ->
displaysJobMatrix
element: '#allowed_failure_jobs'
headers: ['Job', 'Duration', 'Finished', 'Rvm']
jobs: [
{ id: 2, number: '1.2', repo: 'travis-ci/travis-core', finishedAt: '-', duration: '-', rvm: '1.9.3' }
] ]

4
assets/javascripts/spec/repositories_spec.coffee
View File

@ -1,4 +1,4 @@
xdescribe 'The repositories list', -> describe 'The repositories list', ->
beforeEach -> beforeEach ->
app '' app ''
waitFor repositoriesRendered waitFor repositoriesRendered
@ -7,7 +7,7 @@ xdescribe 'The repositories list', ->
href = $('#repositories a.current').attr('href') href = $('#repositories a.current').attr('href')
expect(href).toEqual '#!/travis-ci/travis-core' expect(href).toEqual '#!/travis-ci/travis-core'
xit "links to the repository's last build action", -> it "links to the repository's last build action", ->
href = $('#repositories a.last_build').attr('href') href = $('#repositories a.last_build').attr('href')
expect(href).toEqual '#!/travis-ci/travis-core/builds/1' expect(href).toEqual '#!/travis-ci/travis-core/builds/1'

2
assets/javascripts/spec/repository_spec.coffee
View File

@ -1,4 +1,4 @@
xdescribe 'The repository view', -> describe 'The repository view', ->
beforeEach -> beforeEach ->
app '' app ''
waitFor repositoriesRendered waitFor repositoriesRendered

30
assets/javascripts/spec/support/expectations.coffee
View File

@ -1,51 +1,51 @@
@displaysBuildSummary = (data) -> @displaysBuildSummary = (data) ->
element = $('#build .summary .number a') element = $('#summary .number a')
expect(element.attr('href')).toEqual "#!/#{data.repo}/builds/#{data.id}" expect(element.attr('href')).toEqual "#!/#{data.repo}/builds/#{data.id}"
element = $('#build .summary .finished_at') element = $('#summary .finished_at')
expect(element.text()).toMatch /\d+ (\w+) ago/ expect(element.text()).toMatch /\d+ (\w+) ago/
element = $('#build .summary .duration') element = $('#summary .duration')
expect(element.text()).toEqual data.duration expect(element.text()).toEqual data.duration
element = $('#build .summary .commit a') element = $('#summary .commit a')
expect(element.attr('href')).toEqual "http://github.com/#{data.repo}/commit/#{data.commit}" expect(element.attr('href')).toEqual "http://github.com/#{data.repo}/commit/#{data.commit}"
element = $('#build .summary .commit a') element = $('#summary .commit a')
expect(element.text()).toEqual "#{data.commit} (#{data.branch})" expect(element.text()).toEqual "#{data.commit} (#{data.branch})"
element = $('#build .summary .compare a') element = $('#summary .compare a')
expect(element.attr('href')).toEqual "http://github.com/compare/#{data.compare}" expect(element.attr('href')).toEqual "http://github.com/compare/#{data.compare}"
element = $('#build .summary .compare a') element = $('#summary .compare a')
expect(element.text()).toEqual data.compare expect(element.text()).toEqual data.compare
element = $('#build .summary .message') element = $('#summary .message')
expect(element.text()).toEqual data.message expect(element.text()).toEqual data.message
@displaysBuildMatrix = (data) -> @displaysJobMatrix = (data) ->
headers = ($(element).text() for element in $('#jobs thead th')) headers = ($(element).text() for element in $("#{data.element} thead th"))
expect(headers).toEqual(data.headers) expect(headers).toEqual(data.headers)
$.each data.jobs, (ix, job) -> $.each data.jobs, (ix, job) ->
ix = (ix + 1) * 3 # cuz metamorph is adding two script elements ix = (ix + 1) * 3 # cuz metamorph is adding two script elements
element = $("#jobs tr:nth-child(#{ix}) td.number") element = $("#{data.element} tr:nth-child(#{ix}) td.number")
expect(element.text()).toEqual job.number expect(element.text()).toEqual job.number
element = $("#jobs tr:nth-child(#{ix}) td.number a") element = $("#{data.element} tr:nth-child(#{ix}) td.number a")
expect(element.attr('href')).toEqual "#!/#{job.repo}/jobs/#{job.id}" expect(element.attr('href')).toEqual "#!/#{job.repo}/jobs/#{job.id}"
element = $("#jobs tr:nth-child(#{ix}) td.duration") element = $("#{data.element} tr:nth-child(#{ix}) td.duration")
expect(element.text()).toEqual job.duration expect(element.text()).toEqual job.duration
element = $("#jobs tr:nth-child(#{ix}) td.finished_at") element = $("#{data.element} tr:nth-child(#{ix}) td.finished_at")
if job.finishedAt == '-' if job.finishedAt == '-'
expect(element.text()).toEqual '-' expect(element.text()).toEqual '-'
else else
expect(element.text()).toMatch job.finishedAt expect(element.text()).toMatch job.finishedAt
element = $("#jobs tr:nth-child(#{ix}) td:nth-child(6)") element = $("#{data.element} tr:nth-child(#{ix}) td:nth-child(6)")
expect(element.text()).toEqual job.rvm expect(element.text()).toEqual job.rvm

2
assets/javascripts/spec/tabs_spec.coffee
View File

@ -1,4 +1,4 @@
xdescribe 'The tabs view', -> describe 'The tabs view', ->
describe 'on the "index" state', -> describe 'on the "index" state', ->
beforeEach -> beforeEach ->
app '' app ''

2
public/javascripts/application.js
View File

File diff suppressed because one or more lines are too long

80
public/javascripts/specs/specs.js
View File

@ -1,6 +1,6 @@
(function() { (function() {
xdescribe('The current build tab', function() { describe('The current build tab', function() {
describe('on the "index" state', function() { describe('on the "index" state', function() {
beforeEach(function() { beforeEach(function() {
app(''); app('');
@ -18,20 +18,30 @@
}); });
}); });
return describe('given the current build has a job matrix', function() { return describe('given the current build has a job matrix', function() {
return it('displays the build matrix table', function() { it('displays the jobs matrix table', function() {
return displaysBuildMatrix({ return displaysJobMatrix({
element: '#jobs',
headers: ['Job', 'Duration', 'Finished', 'Rvm'], headers: ['Job', 'Duration', 'Finished', 'Rvm'],
jobs: [ jobs: [
{ {
id: 1, id: 1,
number: '#1.1', number: '1.1',
repo: 'travis-ci/travis-core', repo: 'travis-ci/travis-core',
finishedAt: /\d+ (\w+) ago/, finishedAt: /\d+ (\w+) ago/,
duration: '35 sec', duration: '35 sec',
rvm: 'rbx' rvm: 'rbx'
}, { }
]
});
});
return it('displays the allowed failure jobs matrix table', function() {
return displaysJobMatrix({
element: '#allowed_failure_jobs',
headers: ['Job', 'Duration', 'Finished', 'Rvm'],
jobs: [
{
id: 2, id: 2,
number: '#1.2', number: '1.2',
repo: 'travis-ci/travis-core', repo: 'travis-ci/travis-core',
finishedAt: '-', finishedAt: '-',
duration: '-', duration: '-',
@ -60,20 +70,30 @@
}); });
}); });
return describe('given the current build has a job matrix', function() { return describe('given the current build has a job matrix', function() {
return it('displays the build matrix table', function() { it('displays the jobs matrix table', function() {
return displaysBuildMatrix({ return displaysJobMatrix({
element: '#jobs',
headers: ['Job', 'Duration', 'Finished', 'Rvm'], headers: ['Job', 'Duration', 'Finished', 'Rvm'],
jobs: [ jobs: [
{ {
id: 1, id: 1,
number: '#1.1', number: '1.1',
repo: 'travis-ci/travis-core', repo: 'travis-ci/travis-core',
finishedAt: /\d+ (\w+) ago/, finishedAt: /\d+ (\w+) ago/,
duration: '35 sec', duration: '35 sec',
rvm: 'rbx' rvm: 'rbx'
}, { }
]
});
});
return it('displays the allowed failure jobs matrix table', function() {
return displaysJobMatrix({
element: '#allowed_failure_jobs',
headers: ['Job', 'Duration', 'Finished', 'Rvm'],
jobs: [
{
id: 2, id: 2,
number: '#1.2', number: '1.2',
repo: 'travis-ci/travis-core', repo: 'travis-ci/travis-core',
finishedAt: '-', finishedAt: '-',
duration: '-', duration: '-',
@ -89,7 +109,7 @@
}).call(this); }).call(this);
(function() { (function() {
xdescribe('The repositories list', function() { describe('The repositories list', function() {
beforeEach(function() { beforeEach(function() {
app(''); app('');
return waitFor(repositoriesRendered); return waitFor(repositoriesRendered);
@ -99,7 +119,7 @@
href = $('#repositories a.current').attr('href'); href = $('#repositories a.current').attr('href');
return expect(href).toEqual('#!/travis-ci/travis-core'); return expect(href).toEqual('#!/travis-ci/travis-core');
}); });
return xit("links to the repository's last build action", function() { return it("links to the repository's last build action", function() {
var href; var href;
href = $('#repositories a.last_build').attr('href'); href = $('#repositories a.last_build').attr('href');
return expect(href).toEqual('#!/travis-ci/travis-core/builds/1'); return expect(href).toEqual('#!/travis-ci/travis-core/builds/1');
@ -109,7 +129,7 @@
}).call(this); }).call(this);
(function() { (function() {
xdescribe('The repository view', function() { describe('The repository view', function() {
beforeEach(function() { beforeEach(function() {
app(''); app('');
return waitFor(repositoriesRendered); return waitFor(repositoriesRendered);
@ -164,29 +184,29 @@
this.displaysBuildSummary = function(data) { this.displaysBuildSummary = function(data) {
var element; var element;
element = $('#build .summary .number a'); element = $('#summary .number a');
expect(element.attr('href')).toEqual("#!/" + data.repo + "/builds/" + data.id); expect(element.attr('href')).toEqual("#!/" + data.repo + "/builds/" + data.id);
element = $('#build .summary .finished_at'); element = $('#summary .finished_at');
expect(element.text()).toMatch(/\d+ (\w+) ago/); expect(element.text()).toMatch(/\d+ (\w+) ago/);
element = $('#build .summary .duration'); element = $('#summary .duration');
expect(element.text()).toEqual(data.duration); expect(element.text()).toEqual(data.duration);
element = $('#build .summary .commit a'); element = $('#summary .commit a');
expect(element.attr('href')).toEqual("http://github.com/" + data.repo + "/commit/" + data.commit); expect(element.attr('href')).toEqual("http://github.com/" + data.repo + "/commit/" + data.commit);
element = $('#build .summary .commit a'); element = $('#summary .commit a');
expect(element.text()).toEqual("" + data.commit + " (" + data.branch + ")"); expect(element.text()).toEqual("" + data.commit + " (" + data.branch + ")");
element = $('#build .summary .compare a'); element = $('#summary .compare a');
expect(element.attr('href')).toEqual("http://github.com/compare/" + data.compare); expect(element.attr('href')).toEqual("http://github.com/compare/" + data.compare);
element = $('#build .summary .compare a'); element = $('#summary .compare a');
expect(element.text()).toEqual(data.compare); expect(element.text()).toEqual(data.compare);
element = $('#build .summary .message'); element = $('#summary .message');
return expect(element.text()).toEqual(data.message); return expect(element.text()).toEqual(data.message);
}; };
this.displaysBuildMatrix = function(data) { this.displaysJobMatrix = function(data) {
var element, headers; var element, headers;
headers = (function() { headers = (function() {
var _i, _len, _ref, _results; var _i, _len, _ref, _results;
_ref = $('#jobs thead th'); _ref = $("" + data.element + " thead th");
_results = []; _results = [];
for (_i = 0, _len = _ref.length; _i < _len; _i++) { for (_i = 0, _len = _ref.length; _i < _len; _i++) {
element = _ref[_i]; element = _ref[_i];
@ -197,19 +217,19 @@
expect(headers).toEqual(data.headers); expect(headers).toEqual(data.headers);
return $.each(data.jobs, function(ix, job) { return $.each(data.jobs, function(ix, job) {
ix = (ix + 1) * 3; ix = (ix + 1) * 3;
element = $("#jobs tr:nth-child(" + ix + ") td.number"); element = $("" + data.element + " tr:nth-child(" + ix + ") td.number");
expect(element.text()).toEqual(job.number); expect(element.text()).toEqual(job.number);
element = $("#jobs tr:nth-child(" + ix + ") td.number a"); element = $("" + data.element + " tr:nth-child(" + ix + ") td.number a");
expect(element.attr('href')).toEqual("#!/" + job.repo + "/jobs/" + job.id); expect(element.attr('href')).toEqual("#!/" + job.repo + "/jobs/" + job.id);
element = $("#jobs tr:nth-child(" + ix + ") td.duration"); element = $("" + data.element + " tr:nth-child(" + ix + ") td.duration");
expect(element.text()).toEqual(job.duration); expect(element.text()).toEqual(job.duration);
element = $("#jobs tr:nth-child(" + ix + ") td.finished_at"); element = $("" + data.element + " tr:nth-child(" + ix + ") td.finished_at");
if (job.finishedAt === '-') { if (job.finishedAt === '-') {
expect(element.text()).toEqual('-'); expect(element.text()).toEqual('-');
} else { } else {
expect(element.text()).toMatch(job.finishedAt); expect(element.text()).toMatch(job.finishedAt);
} }
element = $("#jobs tr:nth-child(" + ix + ") td:nth-child(6)"); element = $("" + data.element + " tr:nth-child(" + ix + ") td:nth-child(6)");
return expect(element.text()).toEqual(job.rvm); return expect(element.text()).toEqual(job.rvm);
}); });
}; };
@ -232,7 +252,7 @@
}).call(this); }).call(this);
(function() { (function() {
xdescribe('The tabs view', function() { describe('The tabs view', function() {
describe('on the "index" state', function() { describe('on the "index" state', function() {
beforeEach(function() { beforeEach(function() {
app(''); app('');