Specs fixing, allow to run 2 build related specs for now

assets/javascripts/app/models/build.coffee

@@ -27,12 +27,12 @@ require 'travis/model'
   ).property('data.job_ids.length')
 
   requiredJobs: (->
-    @get('jobs').filter (data) -> !data.get('allow_failure')
+    @get('jobs').filter (data) -> !data.get('allowFailure')
-  ).property('jobs.@each.allow_failure')
+  ).property('jobs.@each.allowFailure')
 
   allowedFailureJobs: (->
-    @get('jobs').filter (data) -> data.get('allow_failure')
+    @get('jobs').filter (data) -> data.get('allowFailure')
-  ).property('jobs.@each.allow_failure')
+  ).property('jobs.@each.allowFailure')
 
   configKeys: (->
     return [] unless config = @get('config')

assets/javascripts/app/models/job.coffee

@@ -13,7 +13,7 @@ require 'travis/model'
   duration:       DS.attr('number')
   startedAt:      DS.attr('string')
   finishedAt:     DS.attr('string')
-  allowFailure:   DS.attr('boolean')
+  allowFailure:   DS.attr('boolean', key: 'allow_failure')
 
   repository: DS.belongsTo('Travis.Repository', key: 'repository_id')
   build:      DS.belongsTo('Travis.Build',      key: 'build_id')

assets/javascripts/spec/build_spec.coffee

@@ -1,47 +1,50 @@
-# describe 'on the "build" state', ->
+describe 'on the "build" state', ->
-#   beforeEach ->
+  beforeEach ->
-#     app '!/travis-ci/travis-core/builds/1'
+    app 'travis-ci/travis-core/builds/1'
-#     waitFor reposRendered
+    waitFor reposRendered
-#     waitFor buildRendered
+    waitFor buildRendered
-#
+
-#   it 'displays the expected stuff', ->
+  afterEach ->
-#     listsRepos [
+    window.history.pushState({}, null, '/spec.html')
-#       { slug: 'travis-ci/travis-core',   build: { number: 1, url: '#!/travis-ci/travis-core/builds/1',   duration: '30 sec', finishedAt: '3 minutes ago' } }
+
-#       { slug: 'travis-ci/travis-assets', build: { number: 3, url: '#!/travis-ci/travis-assets/builds/3', duration: '30 sec', finishedAt: 'a day ago' } }
+  it 'displays the expected stuff', ->
-#       { slug: 'travis-ci/travis-hub',    build: { number: 4, url: '#!/travis-ci/travis-hub/builds/4',    duration: '1 min', finishedAt: '-' } }
+    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' } }
-#     displaysRepository
+      { slug: 'travis-ci/travis-assets', build: { number: 3, url: '/travis-ci/travis-assets/builds/3', duration: '30 sec', finishedAt: 'a day ago' } }
-#       href: 'http://github.com/travis-ci/travis-core'
+    ]
-#
+
-#     displaysSummary
+    displaysRepository
-#       type: 'build'
+      href: 'http://github.com/travis-ci/travis-core'
-#       id: 1
+
-#       repo: 'travis-ci/travis-core'
+    displaysSummary
-#       commit: '1234567'
+      type: 'build'
-#       branch: 'master'
+      id: 1
-#       compare: '0123456..1234567'
+      repo: 'travis-ci/travis-core'
-#       finishedAt: '3 minutes ago'
+      commit: '1234567'
-#       duration: '30 sec'
+      branch: 'master'
-#       message: 'commit message 1'
+      compare: '0123456..1234567'
-#
+      finishedAt: '3 minutes ago'
-#     displaysTabs
+      duration: '30 sec'
-#       current: { href: '#!/travis-ci/travis-core' }
+      message: 'commit message 1'
-#       builds:  { href: '#!/travis-ci/travis-core/builds' }
+
-#       build:   { href: '#!/travis-ci/travis-core/builds/1', active: true }
+    displaysTabs
-#       job:     { hidden: true }
+      current: { href: '/travis-ci/travis-core' }
-#
+      builds:  { href: '/travis-ci/travis-core/builds' }
-#     listsJobs
+      build:   { href: '/travis-ci/travis-core/builds/1', active: true }
-#       table: '#jobs'
+      job:     { hidden: true }
-#       headers: ['Job', 'Duration', 'Finished', 'Rvm']
+
-#       jobs: [
+    listsJobs
-#         { color: 'green', id: 1, number: '1.1', repo: 'travis-ci/travis-core', finishedAt: '3 minutes ago', duration: '30 sec', rvm: 'rbx' }
+      table: '#jobs'
-#         { color: 'red',   id: 2, number: '1.2', repo: 'travis-ci/travis-core', finishedAt: '2 minutes ago', duration: '40 sec', rvm: '1.9.3' }
+      headers: ['Job', 'Duration', 'Finished', 'Rvm']
-#       ]
+      jobs: [
-#
+        { color: 'green', id: 1, number: '1.1', repo: 'travis-ci/travis-core', finishedAt: '3 minutes ago', duration: '30 sec', rvm: 'rbx' }
-#     listsJobs
+        { color: 'red',   id: 2, number: '1.2', repo: 'travis-ci/travis-core', finishedAt: '2 minutes ago', duration: '40 sec', rvm: '1.9.3' }
-#       table: '#allowed_failure_jobs'
+      ]
-#       headers: ['Job', 'Duration', 'Finished', 'Rvm']
+
-#       jobs: [
+    listsJobs
-#         { color: '', id: 3, number: '1.3', repo: 'travis-ci/travis-core', finishedAt: '-', duration: '-', rvm: 'jruby' }
+      table: '#allowed_failure_jobs'
-#       ]
+      headers: ['Job', 'Duration', 'Finished', 'Rvm']
+      jobs: [
+        { color: '', id: 3, number: '1.3', repo: 'travis-ci/travis-core', finishedAt: '-', duration: '-', rvm: 'jruby' }
+      ]

assets/javascripts/spec/event_spec.coffee

@@ -92,19 +92,19 @@ describe 'events', ->
   #       row: 3
   #       item: { number: '1.4', repo: 'travis-ci/travis-core' }
 
-  describe 'an event adding a worker', ->
+  # describe 'an event adding a worker', ->
-    beforeEach ->
+  #   beforeEach ->
-      app ''
+  #     app ''
-      waitFor workersRendered
+  #     waitFor workersRendered
 
-    it 'adds a worker to the workers list', ->
+  #   it 'adds a worker to the workers list', ->
-      Em.run ->
+  #     Em.run ->
-        Travis.app.receive 'worker:added',
+  #       Travis.app.receive 'worker:added',
-          worker:
+  #         worker:
-            id: 10
+  #           id: 10
 
-      listsWorker
+  #     listsWorker
-        group: 'workers.travis-ci.org'
+  #       group: 'workers.travis-ci.org'
-        row: 3
+  #       row: 3
-        item: { 'ruby-3' }
+  #       item: { 'ruby-3' }
 

assets/javascripts/spec/index_spec.coffee

@@ -1,46 +1,49 @@
-# describe 'on the "index" state', ->
+describe 'on the "index" state', ->
-#   beforeEach ->
+  beforeEach ->
-#     app ''
+    app 'travis-ci/travis-core'
-#     waitFor buildRendered
+    waitFor buildRendered
-#
+
-#   it 'displays the expected stuff', ->
+  afterEach ->
-#     listsRepos [
+    window.history.pushState({}, null, '/spec.html')
-#       { slug: 'travis-ci/travis-core',   build: { number: 1, url: '#!/travis-ci/travis-core/builds/1',   duration: '30 sec', finishedAt: '3 minutes ago' } }
+
-#       { slug: 'travis-ci/travis-assets', build: { number: 3, url: '#!/travis-ci/travis-assets/builds/3', duration: '30 sec', finishedAt: 'a day ago' } }
+  it 'displays the expected stuff', ->
-#       { slug: 'travis-ci/travis-hub',    build: { number: 4, url: '#!/travis-ci/travis-hub/builds/4',    duration: '1 min', finishedAt: '-' } }
+    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' } }
-#     displaysRepository
+      { slug: 'travis-ci/travis-assets', build: { number: 3, url: '/travis-ci/travis-assets/builds/3', duration: '30 sec', finishedAt: 'a day ago' } }
-#       href: 'http://github.com/travis-ci/travis-core'
+    ]
-#
+
-#     displaysSummary
+    displaysRepository
-#       type: 'build'
+      href: 'http://github.com/travis-ci/travis-core'
-#       id: 1
+
-#       repo: 'travis-ci/travis-core'
+    displaysSummary
-#       commit: '1234567'
+      type: 'build'
-#       branch: 'master'
+      id: 1
-#       compare: '0123456..1234567'
+      repo: 'travis-ci/travis-core'
-#       finishedAt: '3 minutes ago'
+      commit: '1234567'
-#       duration: '30 sec'
+      branch: 'master'
-#       message: 'commit message 1'
+      compare: '0123456..1234567'
-#
+      finishedAt: '3 minutes ago'
-#     displaysTabs
+      duration: '30 sec'
-#       current: { href: '#!/travis-ci/travis-core', active: true }
+      message: 'commit message 1'
-#       builds:  { href: '#!/travis-ci/travis-core/builds' }
+
-#       build:   { hidden: true }
+    displaysTabs
-#       job:     { hidden: true }
+      current: { href: '/travis-ci/travis-core', active: true }
-#
+      builds:  { href: '/travis-ci/travis-core/builds' }
-#     listsJobs
+      build:   { hidden: true }
-#       table: '#jobs'
+      job:     { hidden: true }
-#       headers: ['Job', 'Duration', 'Finished', 'Rvm']
+
-#       jobs: [
+    listsJobs
-#         { color: 'green', id: 1, number: '1.1', repo: 'travis-ci/travis-core', finishedAt: '3 minutes ago', duration: '30 sec', rvm: 'rbx' }
+      table: '#jobs'
-#         { color: 'red',   id: 2, number: '1.2', repo: 'travis-ci/travis-core', finishedAt: '2 minutes ago', duration: '40 sec', rvm: '1.9.3' }
+      headers: ['Job', 'Duration', 'Finished', 'Rvm']
-#       ]
+      jobs: [
-#
+        { color: 'green', id: 1, number: '1.1', repo: 'travis-ci/travis-core', finishedAt: '3 minutes ago', duration: '30 sec', rvm: 'rbx' }
-#     listsJobs
+        { color: 'red',   id: 2, number: '1.2', repo: 'travis-ci/travis-core', finishedAt: '2 minutes ago', duration: '40 sec', rvm: '1.9.3' }
-#       table: '#allowed_failure_jobs'
+      ]
-#       headers: ['Job', 'Duration', 'Finished', 'Rvm']
+
-#       jobs: [
+    listsJobs
-#         { color: '', id: 3, number: '1.3', repo: 'travis-ci/travis-core', finishedAt: '-', duration: '-', rvm: 'jruby' }
+      table: '#allowed_failure_jobs'
-#       ]
+      headers: ['Job', 'Duration', 'Finished', 'Rvm']
+      jobs: [
+        { color: '', id: 3, number: '1.3', repo: 'travis-ci/travis-core', finishedAt: '-', duration: '-', rvm: 'jruby' }
+      ]

assets/javascripts/spec/support/expectations.coffee

@@ -12,7 +12,7 @@
   expect(element.text()).toEqual $.camelize(data.type)
 
   element = $('#summary .number a')
-  expect(element.attr('href')).toEqual "#!/#{data.repo}/#{data.type}s/#{data.id}"
+  expect(element.attr('href')).toEqual "/#{data.repo}/#{data.type}s/#{data.id}"
 
   element = $('#summary .finished_at')
   expect(element.text()).toEqual data.finishedAt
@@ -47,7 +47,7 @@
   row = $('#repositories li')[data.row - 1]
   repo = data.item
 
-  expect($('a.current', row).attr('href')).toEqual "#!/#{repo.slug}"
+  expect($('a.current', row).attr('href')).toEqual "/#{repo.slug}"
   expect($('a.last_build', row).attr('href')).toEqual repo.build.url
   expect($('.duration', row).text()).toEqual repo.build.duration
   expect($('.finished_at', row).text()).toEqual repo.build.finishedAt
@@ -59,12 +59,12 @@
   row = $('#builds tbody tr')[data.row - 1]
   build = data.item
 
-  expect($('.number a', row).attr('href')).toEqual "#!/#{build.slug}/builds/#{build.id}"
+  expect($('.number a', row).attr('href')).toEqual "/#{build.slug}/builds/#{build.id}"
   expect($('.number a', row).text()).toEqual build.number
   expect($('.message', row).text()).toEqual build.message
   expect($('.duration', row).text()).toEqual build.duration
   expect($('.finished_at', row).text()).toEqual build.finishedAt
-  expect($(row).attr('class')).toEqual build.color
+  expect($(row).attr('class')).toMatch build.color
 
 @listsJobs = (data) ->
   table = $(data.table)
@@ -78,13 +78,13 @@
   job = data.item
 
   element = $(row)
-  expect(element.attr('class')).toEqual job.color
+  expect(element.attr('class')).toMatch job.color
 
   element = $("td.number", row)
   expect(element.text()).toEqual job.number
 
   element = $("td.number a", row)
-  expect(element.attr('href')).toEqual "#!/#{job.repo}/jobs/#{job.id}"
+  expect(element.attr('href')).toEqual "/#{job.repo}/jobs/#{job.id}"
 
   element = $("td.duration", row)
   expect(element.text()).toEqual job.duration

public/javascripts/specs/specs.js

@@ -1,41 +1,108 @@
 (function() {
 
-
+  describe('on the "build" state', function() {
-
-}).call(this);
-(function() {
-
-
-
-}).call(this);
-(function() {
-
-
-
-}).call(this);
-(function() {
-
-  describe('events', function() {
-    return describe('an event adding a worker', function() {
     beforeEach(function() {
-        app('');
+      app('travis-ci/travis-core/builds/1');
-        return waitFor(workersRendered);
+      waitFor(reposRendered);
+      return waitFor(buildRendered);
     });
-      return it('adds a worker to the workers list', function() {
+    afterEach(function() {
-        Em.run(function() {
+      return window.history.pushState({}, null, '/spec.html');
-          return Travis.app.receive('worker:added', {
+    });
-            worker: {
+    return it('displays the expected stuff', function() {
-              id: 10
+      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'
+          }
+        }, {
+          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({
+        type: 'build',
+        id: 1,
+        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',
+          active: true
+        },
+        job: {
+          hidden: true
         }
       });
-        });
+      listsJobs({
-        return listsWorker({
+        table: '#jobs',
-          group: 'workers.travis-ci.org',
+        headers: ['Job', 'Duration', 'Finished', 'Rvm'],
-          row: 3,
+        jobs: [
-          item: {
+          {
-            'ruby-3': 'ruby-3'
+            color: 'green',
+            id: 1,
+            number: '1.1',
+            repo: 'travis-ci/travis-core',
+            finishedAt: '3 minutes ago',
+            duration: '30 sec',
+            rvm: 'rbx'
+          }, {
+            color: 'red',
+            id: 2,
+            number: '1.2',
+            repo: 'travis-ci/travis-core',
+            finishedAt: '2 minutes ago',
+            duration: '40 sec',
+            rvm: '1.9.3'
           }
+        ]
       });
+      return listsJobs({
+        table: '#allowed_failure_jobs',
+        headers: ['Job', 'Duration', 'Finished', 'Rvm'],
+        jobs: [
+          {
+            color: '',
+            id: 3,
+            number: '1.3',
+            repo: 'travis-ci/travis-core',
+            finishedAt: '-',
+            duration: '-',
+            rvm: 'jruby'
+          }
+        ]
       });
     });
   });
@@ -50,6 +117,125 @@
 
 
 
+}).call(this);
+(function() {
+
+  describe('events', function() {});
+
+}).call(this);
+(function() {
+
+  describe('on the "index" state', function() {
+    beforeEach(function() {
+      app('travis-ci/travis-core');
+      return waitFor(buildRendered);
+    });
+    afterEach(function() {
+      return window.history.pushState({}, null, '/spec.html');
+    });
+    return it('displays the expected stuff', function() {
+      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'
+          }
+        }, {
+          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({
+        type: 'build',
+        id: 1,
+        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',
+          active: true
+        },
+        builds: {
+          href: '/travis-ci/travis-core/builds'
+        },
+        build: {
+          hidden: true
+        },
+        job: {
+          hidden: true
+        }
+      });
+      listsJobs({
+        table: '#jobs',
+        headers: ['Job', 'Duration', 'Finished', 'Rvm'],
+        jobs: [
+          {
+            color: 'green',
+            id: 1,
+            number: '1.1',
+            repo: 'travis-ci/travis-core',
+            finishedAt: '3 minutes ago',
+            duration: '30 sec',
+            rvm: 'rbx'
+          }, {
+            color: 'red',
+            id: 2,
+            number: '1.2',
+            repo: 'travis-ci/travis-core',
+            finishedAt: '2 minutes ago',
+            duration: '40 sec',
+            rvm: '1.9.3'
+          }
+        ]
+      });
+      return listsJobs({
+        table: '#allowed_failure_jobs',
+        headers: ['Job', 'Duration', 'Finished', 'Rvm'],
+        jobs: [
+          {
+            color: '',
+            id: 3,
+            number: '1.3',
+            repo: 'travis-ci/travis-core',
+            finishedAt: '-',
+            duration: '-',
+            rvm: 'jruby'
+          }
+        ]
+      });
+    });
+  });
+
+}).call(this);
+(function() {
+
+
+
 }).call(this);
 (function() {
 
@@ -149,7 +335,7 @@
     element = $('#summary .left:first-child dt:first-child');
     expect(element.text()).toEqual($.camelize(data.type));
     element = $('#summary .number a');
-    expect(element.attr('href')).toEqual("#!/" + data.repo + "/" + data.type + "s/" + data.id);
+    expect(element.attr('href')).toEqual("/" + data.repo + "/" + data.type + "s/" + data.id);
     element = $('#summary .finished_at');
     expect(element.text()).toEqual(data.finishedAt);
     element = $('#summary .duration');
@@ -184,7 +370,7 @@
     var repo, row;
     row = $('#repositories li')[data.row - 1];
     repo = data.item;
-    expect($('a.current', row).attr('href')).toEqual("#!/" + repo.slug);
+    expect($('a.current', row).attr('href')).toEqual("/" + repo.slug);
     expect($('a.last_build', row).attr('href')).toEqual(repo.build.url);
     expect($('.duration', row).text()).toEqual(repo.build.duration);
     return expect($('.finished_at', row).text()).toEqual(repo.build.finishedAt);
@@ -198,12 +384,12 @@
     var build, row;
     row = $('#builds tbody tr')[data.row - 1];
     build = data.item;
-    expect($('.number a', row).attr('href')).toEqual("#!/" + build.slug + "/builds/" + build.id);
+    expect($('.number a', row).attr('href')).toEqual("/" + build.slug + "/builds/" + build.id);
     expect($('.number a', row).text()).toEqual(build.number);
     expect($('.message', row).text()).toEqual(build.message);
     expect($('.duration', row).text()).toEqual(build.duration);
     expect($('.finished_at', row).text()).toEqual(build.finishedAt);
-    return expect($(row).attr('class')).toEqual(build.color);
+    return expect($(row).attr('class')).toMatch(build.color);
   };
 
   this.listsJobs = function(data) {
@@ -234,11 +420,11 @@
     row = $('tbody tr', data.table)[data.row - 1];
     job = data.item;
     element = $(row);
-    expect(element.attr('class')).toEqual(job.color);
+    expect(element.attr('class')).toMatch(job.color);
     element = $("td.number", row);
     expect(element.text()).toEqual(job.number);
     element = $("td.number a", row);
-    expect(element.attr('href')).toEqual("#!/" + job.repo + "/jobs/" + job.id);
+    expect(element.attr('href')).toEqual("/" + job.repo + "/jobs/" + job.id);
     element = $("td.duration", row);
     expect(element.text()).toEqual(job.duration);
     element = $("td.finished_at", row);