Merge branch 'pull-requests' of github.com:travis-ci/travis-ci into p…

…ull-requests
KL-7 · Apr 16, 2012 · 463b295 · 463b295
2 parents d49d7fd + 600c041
commit 463b295
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 40 deletions.
diff --git a/app/controllers/builds_controller.rb b/app/controllers/builds_controller.rb
@@ -23,13 +23,7 @@ def repository
     end
 
     def builds_type
-      base = repository.builds.includes('request')
-
-      if params['event_type'] == 'pull_requests'
-        base.pull_requests
-      else
-        base.pushes
-      end
+      repository.builds.for_event_type(params['event_type'])
     end
 
     def builds

diff --git a/db/seeds.rb b/db/seeds.rb
@@ -17,15 +17,14 @@
 
   [Repository, Commit, Request, Build].each{ |klass| klass.reset_column_information }
 
-    10.times do
-      repository = FactoryGirl.create(:seed_repository)
+  10.times do
+    repository = FactoryGirl.create(:seed_repository)
 
-      50.times do
-        build = FactoryGirl.create(:seed_build, :repository => repository)
-      end
-
-      repository.last_build_id = repository.last_build.id
-      repository.save
+    50.times do
+      build = FactoryGirl.create(:seed_build, :repository => repository)
+    end
 
+    repository.last_build_id = repository.last_build.id
+    repository.save
   end
 end
diff --git a/spec/javascripts/helpers/factories.js b/spec/javascripts/helpers/factories.js
@@ -9,7 +9,8 @@ Test.Factory = {
         last_build_number: '1',
         last_build_result: '0',
         last_build_started_at: '2011-01-01T01:00:10Z',
-        last_build_finished_at: '2011-01-01T01:00:20Z'
+        last_build_finished_at: '2011-01-01T01:00:20Z',
+        event_type: 'push'
       }, 1);
       return Travis.store.find(Travis.Repository, 1);
     },
@@ -70,6 +71,7 @@ Test.Factory = {
         author_name: 'Alex P',
         author_email: 'alexp@coffeenco.de',
         compare_url: 'https://github.com/travis-ci/travis-ci/compare/fe64573...3d1e844',
+        event_type: 'push',
         matrix: [
           {
             id: 2,

diff --git a/spec/javascripts/models/build_spec.js b/spec/javascripts/models/build_spec.js
@@ -1,12 +1,19 @@
 describe('Build', function() {
   describe('class methods', function() {
-    describe('byRepositoryId', function() {
+    describe('pushesByRepositoryId', function() {
       it('requests GET /repositories.json', function() {
-        Travis.Build.byRepositoryId(1);
+        Travis.Build.pushesByRepositoryId(1);
         expect(mostRecentAjaxRequest().url).toEqual('/repositories/1/builds.json?bare=true');
       });
     });
 
+    describe('pullRequestsByRepositoryId', function() {
+      it('requests GET /repositories.json', function() {
+        Travis.Build.pullRequestsByRepositoryId(1);
+        expect(mostRecentAjaxRequest().url).toEqual('/repositories/1/builds.json?bare=true&event_type=pull_requests');
+      });
+    });
+
     describe('createOrUpdate', function() {
       it('calls createOrUpdate for each of the matrix builds, too', function() {
         var build = Travis.Build.createOrUpdate({ id: 99, number: '1', matrix: [{ id: 2, number: '1.1' }]});

diff --git a/spec/support/factories/factories.rb b/spec/support/factories/factories.rb
@@ -8,6 +8,7 @@
   end
 
   factory :commit do
+    repository { Repository.first || Factory(:repository) }
     commit  '62aae5f70ceee39123ef'
     branch  'master'
     message 'the commit message'

diff --git a/spec/support/factories/forged_factories.rb b/spec/support/factories/forged_factories.rb
@@ -1,24 +1,24 @@
 FactoryGirl.define do
   factory :seed_repository, :class => Repository do
-    name                      { Forgery(:repository).name }
-    url                       { Forgery(:repository).url }
-    owner_name                { Forgery(:repository).owner_name }
-    owner_email               { Forgery(:repository).owner_email }
-    last_duration             { Forgery(:repository).duration }
-    created_at                { Forgery(:repository).time }
-    updated_at                { Forgery(:repository).time }
+    name             { Forgery(:repository).name }
+    url              { Forgery(:repository).url }
+    owner_name       { Forgery(:repository).owner_name }
+    owner_email      { Forgery(:repository).owner_email }
+    last_duration    { Forgery(:repository).duration }
+    created_at       { Forgery(:repository).time }
+    updated_at       { Forgery(:repository).time }
   end
 
   factory :seed_commit, :class => Commit do
-    commit                 { Forgery(:commit).commit }
-    branch                 { Forgery(:commit).branch }
-    message                { Forgery(:commit).message }
-    committed_at           { Forgery(:repository).time }
-    committer_name         { Forgery(:commit).commiter_name }
-    committer_email        { Forgery(:commit).commiter_email }
-    author_name            { Forgery(:commit).commiter_name }
-    author_email           { Forgery(:commit).commiter_email }
-    compare_url            { Forgery(:commit).compare_url }
+    commit           { Forgery(:commit).commit }
+    branch           { Forgery(:commit).branch }
+    message          { Forgery(:commit).message }
+    committed_at     { Forgery(:repository).time }
+    committer_name   { Forgery(:commit).commiter_name }
+    committer_email  { Forgery(:commit).commiter_email }
+    author_name      { Forgery(:commit).commiter_name }
+    author_email     { Forgery(:commit).commiter_email }
+    compare_url      { Forgery(:commit).compare_url }
   end
 
 
@@ -27,12 +27,12 @@
   end
 
   factory :seed_build, :class=> Build do
-    config                 { Forgery(:build).config }
-    commit                 { Factory(:seed_commit) }
-    started_at             { Forgery(:repository).time }
-    finished_at            { Forgery(:repository).time }
-    state                  "finished"
-    status                 { rand(2) }
+    config           { Forgery(:build).config }
+    commit           { |b| Factory(:seed_commit, repository: b.repository) }
+    started_at       { Forgery(:repository).time }
+    finished_at      { Forgery(:repository).time }
+    state            "finished"
+    status           { rand(2) }
 
     after_build do |build|
       build.request = Factory(:seed_request, :repository => build.repository, :commit => build.commit)