v3 merge with master to fix default_branch spec error, fix services/repository spec

This commit is contained in:
carlad 2015-11-25 19:17:33 +01:00
parent 2974dccd3b
commit 086932df11
2 changed files with 17 additions and 4 deletions

View File

@ -42,6 +42,8 @@ describe Travis::API::V3::Services::Repositories::ForCurrentUser do
"read" => true, "read" => true,
"enable" => true, "enable" => true,
"disable" => true, "disable" => true,
"star" => true,
"unstar" => true,
"create_request" => true}, "create_request" => true},
"id" => repo.id, "id" => repo.id,
"name" => "minimal", "name" => "minimal",
@ -59,7 +61,9 @@ describe Travis::API::V3::Services::Repositories::ForCurrentUser do
"@type" => "branch", "@type" => "branch",
"@href" => "/v3/repo/#{repo.id}/branch/master", "@href" => "/v3/repo/#{repo.id}/branch/master",
"@representation" => "minimal", "@representation" => "minimal",
"name" => "master"}}] "name" => "master"},
"starred" => false
}]
}} }}
end end

View File

@ -111,6 +111,8 @@ describe Travis::API::V3::Services::Repository::Find do
"read" => true, "read" => true,
"enable" => false, "enable" => false,
"disable" => false, "disable" => false,
"star" => false,
"unstar" => false,
"create_request" => false}, "create_request" => false},
"id" => repo.id, "id" => repo.id,
"name" => "minimal", "name" => "minimal",
@ -128,7 +130,8 @@ describe Travis::API::V3::Services::Repository::Find do
"@type" => "branch", "@type" => "branch",
"@href" => "/v3/repo/#{repo.id}/branch/master", "@href" => "/v3/repo/#{repo.id}/branch/master",
"@representation" => "minimal", "@representation" => "minimal",
"name" => "master"} "name" => "master"},
"starred" => false
}} }}
end end
@ -170,6 +173,8 @@ describe Travis::API::V3::Services::Repository::Find do
"read" => true, "read" => true,
"enable" => true, "enable" => true,
"disable" => true, "disable" => true,
"star" => true,
"unstar" => true,
"create_request" => true}, "create_request" => true},
"id" => repo.id, "id" => repo.id,
"name" => "minimal", "name" => "minimal",
@ -187,7 +192,8 @@ describe Travis::API::V3::Services::Repository::Find do
"@type" => "branch", "@type" => "branch",
"@href" => "/v3/repo/#{repo.id}/branch/master", "@href" => "/v3/repo/#{repo.id}/branch/master",
"@representation" => "minimal", "@representation" => "minimal",
"name" => "master"} "name" => "master"},
"starred" => false
}} }}
end end
@ -235,6 +241,8 @@ describe Travis::API::V3::Services::Repository::Find do
"read" => true, "read" => true,
"enable" => true, "enable" => true,
"disable" => true, "disable" => true,
"star" => true,
"unstar" => true,
"create_request" => true}, "create_request" => true},
"id" => repo.id, "id" => repo.id,
"name" => "minimal", "name" => "minimal",
@ -252,7 +260,8 @@ describe Travis::API::V3::Services::Repository::Find do
"@type" => "branch", "@type" => "branch",
"@href" => "/v3/repo/#{repo.id}/branch/master", "@href" => "/v3/repo/#{repo.id}/branch/master",
"@representation" => "minimal", "@representation" => "minimal",
"name" => "master"} "name" => "master"},
"starred" => false
}} }}
end end