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
17afb671
Commit
17afb671
authored
May 18, 2021
by
Suraj
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed offenses in spec/models/* part 2
Changelog: fixed
parent
c73db5e2
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
9 additions
and
13 deletions
+9
-13
.rubocop_manual_todo.yml
.rubocop_manual_todo.yml
+0
-4
spec/models/container_repository_spec.rb
spec/models/container_repository_spec.rb
+1
-1
spec/models/diff_discussion_spec.rb
spec/models/diff_discussion_spec.rb
+3
-3
spec/models/diff_note_spec.rb
spec/models/diff_note_spec.rb
+4
-4
spec/models/email_spec.rb
spec/models/email_spec.rb
+1
-1
No files found.
.rubocop_manual_todo.yml
View file @
17afb671
...
@@ -168,11 +168,7 @@ Rails/SaveBang:
...
@@ -168,11 +168,7 @@ Rails/SaveBang:
-
'
spec/models/application_record_spec.rb'
-
'
spec/models/application_record_spec.rb'
-
'
spec/models/application_setting_spec.rb'
-
'
spec/models/application_setting_spec.rb'
-
'
spec/models/clusters/applications/helm_spec.rb'
-
'
spec/models/clusters/applications/helm_spec.rb'
-
'
spec/models/container_repository_spec.rb'
-
'
spec/models/design_management/version_spec.rb'
-
'
spec/models/design_management/version_spec.rb'
-
'
spec/models/diff_discussion_spec.rb'
-
'
spec/models/diff_note_spec.rb'
-
'
spec/models/email_spec.rb'
-
'
spec/models/environment_spec.rb'
-
'
spec/models/environment_spec.rb'
-
'
spec/models/event_spec.rb'
-
'
spec/models/event_spec.rb'
-
'
spec/models/fork_network_spec.rb'
-
'
spec/models/fork_network_spec.rb'
...
...
spec/models/container_repository_spec.rb
View file @
17afb671
...
@@ -320,7 +320,7 @@ RSpec.describe ContainerRepository do
...
@@ -320,7 +320,7 @@ RSpec.describe ContainerRepository do
before
do
before
do
group
.
parent
=
test_group
group
.
parent
=
test_group
group
.
save
group
.
save
!
end
end
it
{
is_expected
.
to
contain_exactly
(
repository
,
another_repository
)
}
it
{
is_expected
.
to
contain_exactly
(
repository
,
another_repository
)
}
...
...
spec/models/diff_discussion_spec.rb
View file @
17afb671
...
@@ -21,9 +21,9 @@ RSpec.describe DiffDiscussion do
...
@@ -21,9 +21,9 @@ RSpec.describe DiffDiscussion do
describe
'#merge_request_version_params'
do
describe
'#merge_request_version_params'
do
let
(
:merge_request
)
{
create
(
:merge_request
,
source_project:
project
,
target_project:
project
,
importing:
true
)
}
let
(
:merge_request
)
{
create
(
:merge_request
,
source_project:
project
,
target_project:
project
,
importing:
true
)
}
let!
(
:merge_request_diff1
)
{
merge_request
.
merge_request_diffs
.
create
(
head_commit_sha:
'6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9'
)
}
let!
(
:merge_request_diff1
)
{
merge_request
.
merge_request_diffs
.
create
!
(
head_commit_sha:
'6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9'
)
}
let!
(
:merge_request_diff2
)
{
merge_request
.
merge_request_diffs
.
create
(
head_commit_sha:
nil
)
}
let!
(
:merge_request_diff2
)
{
merge_request
.
merge_request_diffs
.
create
!
(
head_commit_sha:
nil
)
}
let!
(
:merge_request_diff3
)
{
merge_request
.
merge_request_diffs
.
create
(
head_commit_sha:
'5937ac0a7beb003549fc5fd26fc247adbce4a52e'
)
}
let!
(
:merge_request_diff3
)
{
merge_request
.
merge_request_diffs
.
create
!
(
head_commit_sha:
'5937ac0a7beb003549fc5fd26fc247adbce4a52e'
)
}
context
'when the discussion is active'
do
context
'when the discussion is active'
do
it
'returns an empty hash, which will end up showing the latest version'
do
it
'returns an empty hash, which will end up showing the latest version'
do
...
...
spec/models/diff_note_spec.rb
View file @
17afb671
...
@@ -167,7 +167,7 @@ RSpec.describe DiffNote do
...
@@ -167,7 +167,7 @@ RSpec.describe DiffNote do
end
end
it
'creates a diff note file'
do
it
'creates a diff note file'
do
subject
.
save
subject
.
save
!
expect
(
subject
.
note_diff_file
).
to
be_present
expect
(
subject
.
note_diff_file
).
to
be_present
end
end
end
end
...
@@ -188,7 +188,7 @@ RSpec.describe DiffNote do
...
@@ -188,7 +188,7 @@ RSpec.describe DiffNote do
end
end
it
'raises an error'
do
it
'raises an error'
do
expect
{
subject
.
save
}.
to
raise_error
(
::
DiffNote
::
NoteDiffFileCreationError
,
expect
{
subject
.
save
!
}.
to
raise_error
(
::
DiffNote
::
NoteDiffFileCreationError
,
"Failed to find diff line for:
#{
diff_file
.
file_path
}
, "
\
"Failed to find diff line for:
#{
diff_file
.
file_path
}
, "
\
"old_line:
#{
position
.
old_line
}
"
\
"old_line:
#{
position
.
old_line
}
"
\
", new_line:
#{
position
.
new_line
}
"
)
", new_line:
#{
position
.
new_line
}
"
)
...
@@ -201,7 +201,7 @@ RSpec.describe DiffNote do
...
@@ -201,7 +201,7 @@ RSpec.describe DiffNote do
end
end
it
'creates a diff note file'
do
it
'creates a diff note file'
do
subject
.
save
subject
.
save
!
expect
(
subject
.
reload
.
note_diff_file
).
to
be_present
expect
(
subject
.
reload
.
note_diff_file
).
to
be_present
end
end
end
end
...
@@ -544,7 +544,7 @@ RSpec.describe DiffNote do
...
@@ -544,7 +544,7 @@ RSpec.describe DiffNote do
it
"does not update the position"
do
it
"does not update the position"
do
expect
(
subject
).
not_to
receive
(
:update_position
)
expect
(
subject
).
not_to
receive
(
:update_position
)
subject
.
save
subject
.
save
!
end
end
end
end
...
...
spec/models/email_spec.rb
View file @
17afb671
...
@@ -24,7 +24,7 @@ RSpec.describe Email do
...
@@ -24,7 +24,7 @@ RSpec.describe Email do
let
(
:user
)
{
create
(
:user
)
}
let
(
:user
)
{
create
(
:user
)
}
it
'synchronizes the gpg keys when the email is updated'
do
it
'synchronizes the gpg keys when the email is updated'
do
email
=
user
.
emails
.
create
(
email:
'new@email.com'
)
email
=
user
.
emails
.
create
!
(
email:
'new@email.com'
)
expect
(
user
).
to
receive
(
:update_invalid_gpg_signatures
)
expect
(
user
).
to
receive
(
:update_invalid_gpg_signatures
)
...
...
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