Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2018-01-19 02:07:00 +0300
committerRobert Speicher <robert@gitlab.com>2018-01-19 02:07:00 +0300
commit676d558a37ad59d042fc3640c66c452944884851 (patch)
tree07fa616213133d2015fe03b8b55e2d60cac09c39 /spec
parentdef2f1299512ce43370aa5b727a3d7f4733adf96 (diff)
parent0c2e8ef85763bee34b975bb8df4ed0bda093dcae (diff)
Merge branch '42187-update-gitlab-styles-to-2-3-0' into 'master'
Resolve "Update gitlab-styles to 2.3.0" Closes #42187 See merge request gitlab-org/gitlab-ce!16558
Diffstat (limited to 'spec')
-rw-r--r--spec/requests/api/jobs_spec.rb2
-rw-r--r--spec/requests/api/v3/builds_spec.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/requests/api/jobs_spec.rb b/spec/requests/api/jobs_spec.rb
index e211c347266..4dd8deb6404 100644
--- a/spec/requests/api/jobs_spec.rb
+++ b/spec/requests/api/jobs_spec.rb
@@ -53,7 +53,7 @@ describe API::Jobs do
expect(json_job['pipeline']['status']).to eq job.pipeline.status
end
- it 'avoids N+1 queries', skip_before_request: true do
+ it 'avoids N+1 queries', :skip_before_request do
first_build = create(:ci_build, :artifacts, pipeline: pipeline)
first_build.runner = create(:ci_runner)
first_build.user = create(:user)
diff --git a/spec/requests/api/v3/builds_spec.rb b/spec/requests/api/v3/builds_spec.rb
index cdbc5692e19..af9e36a3b29 100644
--- a/spec/requests/api/v3/builds_spec.rb
+++ b/spec/requests/api/v3/builds_spec.rb
@@ -42,7 +42,7 @@ describe API::V3::Builds do
expect(json_build['pipeline']['status']).to eq build.pipeline.status
end
- it 'avoids N+1 queries', skip_before_request: true do
+ it 'avoids N+1 queries', :skip_before_request do
first_build = create(:ci_build, :artifacts, pipeline: pipeline)
first_build.runner = create(:ci_runner)
first_build.user = create(:user)