Skip to content
This repository has been archived by the owner on May 10, 2018. It is now read-only.

Commit

Permalink
Merge branch 'master' of github.com:travis-ci/travis-core
Browse files Browse the repository at this point in the history
  • Loading branch information
svenfuchs committed Dec 10, 2012
2 parents 4916e63 + cf3dc30 commit 707a3b0
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 24 deletions.
3 changes: 2 additions & 1 deletion lib/travis/api/v1/pusher/build/started.rb
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ def build_data
'committer_name' => commit.committer_name,
'committer_email' => commit.committer_email,
'event_type' => request.event_type,
'matrix' => build.matrix.map { |job| Job.new(job).data },
'job_ids' => build.matrix.map(&:id),
'state' => build.state.to_s
}
end

Expand Down
23 changes: 0 additions & 23 deletions spec/travis/api/v1/pusher/build/started_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -33,29 +33,6 @@
}
end

it 'matrix' do
data['build']['matrix'].first.should == {
'id' => test.id,
'repository_id' => build.repository_id,
'started_at' => json_format_time(Time.now.utc - 1.minute),
'finished_at' => nil,
'parent_id' => test.source_id,
'number' => '2.1',
'state' => 'started',
'config' => { 'rvm' => '1.8.7', 'gemfile' => 'test/Gemfile.rails-2.3.x' },
'commit' => '62aae5f70ceee39123ef',
'branch' => 'master',
'message' => 'the commit message',
'author_name' => 'Sven Fuchs',
'author_email' => 'svenfuchs@artweb-design.de',
'committer_name' => 'Sven Fuchs',
'committer_email' => 'svenfuchs@artweb-design.de',
'committed_at' => json_format_time(Time.now.utc - 1.hour),
'compare_url' => 'https://github.com/svenfuchs/minimal/compare/master...develop',
'allow_failure' => false
}
end

it 'repository' do
data['repository'].should == {
'id' => build.repository_id,
Expand Down

0 comments on commit 707a3b0

Please sign in to comment.