Commit dd8102f2 authored by Kamil Trzcinski's avatar Kamil Trzcinski
Browse files

Fix specs

parent aaa101f56f76
......@@ -830,11 +830,13 @@ def any_runners?(&block)
end
def valid_runners_token? token
self.token && self.token == token
self.runners_token && self.runners_token == token
end
# TODO (ayufan): For now we use runners_token (backward compatibility)
# In 8.4 every build will have its own individual token valid for time of build
def valid_build_token? token
self.token && self.token == token
self.builds_enabled? && self.runners_token && self.runners_token == token
end
def build_coverage_enabled?
......
......@@ -39,12 +39,12 @@
%th Name
%th Duration
%th Finished at
- if @ci_commit.project.coverage_enabled?
- if @ci_commit.project.build_coverage_enabled?
%th Coverage
%th
- @ci_commit.refs.each do |ref|
= render partial: "projects/commit_statuses/commit_status", collection: @ci_commit.statuses.for_ref(ref).latest.ordered,
locals: { coverage: @ci_commit.project.coverage_enabled?, stage: true, allow_retry: true }
locals: { coverage: @ci_commit.project.build_coverage_enabled?, stage: true, allow_retry: true }
- if @ci_commit.retried.any?
.gray-content-block.second-block
......@@ -61,8 +61,8 @@
%th Name
%th Duration
%th Finished at
- if @ci_commit.project.coverage_enabled?
- if @ci_commit.project.build_coverage_enabled?
%th Coverage
%th
= render partial: "projects/commit_statuses/commit_status", collection: @ci_commit.retried,
locals: { coverage: @ci_commit.project.coverage_enabled?, stage: true }
locals: { coverage: @ci_commit.project.build_coverage_enabled?, stage: true }
......@@ -68,4 +68,4 @@
-F token=TOKEN \
-F "ref=REF_NAME" \
-F "variables[RUN_NIGHTLY_BUILD]=true" \
#{builds_trigger_url(@project.id, 'TOKEN')}
#{builds_trigger_url(@project.id)}
......@@ -78,7 +78,7 @@ def ci_request?(login, password)
underscored_service = matched_login['s'].underscore
if underscored_service == 'gitlab_ci'
return project && project.builds_enabled? && project.valid_build_token?(password)
return project && project.valid_build_token?(password)
elsif Service.available_services_names.include?(underscored_service)
service_method = "#{underscored_service}_service"
service = project.send(service_method)
......
......@@ -386,7 +386,7 @@
it { is_expected.to be_a(String) }
it { is_expected.to end_with(".git") }
it { is_expected.to start_with(project.web_url[0..6]) }
it { is_expected.to include(project.token) }
it { is_expected.to include(build.token) }
it { is_expected.to include('gitlab-ci-token') }
it { is_expected.to include(project.web_url[7..-1]) }
end
......
......@@ -39,12 +39,13 @@
it { is_expected.to belong_to(:commit) }
it { is_expected.to belong_to(:user) }
it { is_expected.to belong_to(:project) }
it { is_expected.to validate_presence_of(:name) }
it { is_expected.to validate_inclusion_of(:status).in_array(%w(pending running failed success canceled)) }
it { is_expected.to delegate_method(:sha).to(:commit) }
it { is_expected.to delegate_method(:short_sha).to(:commit) }
it { is_expected.to delegate_method(:project).to(:commit) }
it { is_expected.to respond_to :success? }
it { is_expected.to respond_to :failed? }
......
......@@ -20,11 +20,11 @@
)
end
it { expect(commit).to be_kind_of(Commit) }
it { expect(commit).to be_kind_of(Ci::Commit) }
it { expect(commit).to be_valid }
it { expect(commit).to be_persisted }
it { expect(commit).to eq(project.ci_commits.last) }
it { expect(commit.builds.first).to be_kind_of(Build) }
it { expect(commit.builds.first).to be_kind_of(Ci::Build) }
end
context "skip tag if there is no build for it" do
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment