Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
33c69afd
Commit
33c69afd
authored
Nov 07, 2017
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve test merge_request_with_sast_spec.rb
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
b04c8ff9
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
20 additions
and
5 deletions
+20
-5
spec/ee/spec/features/projects/merge_requests/merge_request_with_sast_spec.rb
...s/projects/merge_requests/merge_request_with_sast_spec.rb
+20
-5
No files found.
spec/ee/spec/features/projects/merge_requests/merge_request_with_sast_spec.rb
View file @
33c69afd
...
...
@@ -2,14 +2,30 @@ require 'spec_helper'
describe
'Merge request with sast'
,
:js
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:project
)
{
create
:project
,
:repository
}
let
(
:project
)
{
create
(
:project
,
:public
,
:repository
)
}
let
(
:merge_request
)
do
create
(
:merge_request_with_diffs
,
source_project:
project
,
target_project:
project
,
author:
user
,
title:
'Bug NS-04'
)
end
let
(
:pipeline
)
do
create
(
:ci_empty_pipeline
,
status: :created
,
project:
project
)
create
(
:ci_pipeline
,
:success
,
project:
project
,
sha:
merge_request
.
diff_head_sha
,
ref:
merge_request
.
source_branch
,
head_pipeline_of:
merge_request
)
end
let
(
:build
)
do
let!
(
:build
)
do
create
(
:ci_build
,
:artifacts
,
:success
,
name:
'sast'
,
pipeline:
pipeline
,
options:
{
...
...
@@ -19,10 +35,9 @@ describe 'Merge request with sast', :js do
}
)
end
let
(
:merge_request
)
{
create
(
:merge_request
,
source_project:
project
,
target_project:
project
)
}
before
do
allow
(
merge_request
).
to
receive
(
:sast_artifact
).
and_return
(
build
)
stub_licensed_features
(
sast:
true
)
project
.
add_developer
(
user
)
sign_in
(
user
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment