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
0
Merge Requests
0
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
Kazuhiko Shiozaki
gitlab-ce
Commits
8773f339
Commit
8773f339
authored
9 years ago
by
Robert Speicher
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Minor model spec cleanups
Snippet model was missing project association
parent
c0faf91f
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
17 additions
and
27 deletions
+17
-27
app/models/snippet.rb
app/models/snippet.rb
+2
-1
spec/models/issue_spec.rb
spec/models/issue_spec.rb
+2
-5
spec/models/merge_request_spec.rb
spec/models/merge_request_spec.rb
+8
-13
spec/models/snippet_spec.rb
spec/models/snippet_spec.rb
+5
-5
spec/models/user_spec.rb
spec/models/user_spec.rb
+0
-3
No files found.
app/models/snippet.rb
View file @
8773f339
...
...
@@ -24,7 +24,8 @@ class Snippet < ActiveRecord::Base
default_value_for
:visibility_level
,
Snippet
::
PRIVATE
belongs_to
:author
,
class_name:
"User"
belongs_to
:author
,
class_name:
'User'
belongs_to
:project
has_many
:notes
,
as: :noteable
,
dependent: :destroy
...
...
This diff is collapsed.
Click to expand it.
spec/models/issue_spec.rb
View file @
8773f339
...
...
@@ -60,11 +60,8 @@ describe Issue do
describe
'#is_being_reassigned?'
do
it
'returns issues assigned to user'
do
user
=
create
:user
2
.
times
do
issue
=
create
:issue
,
assignee:
user
end
user
=
create
(
:user
)
create_list
(
:issue
,
2
,
assignee:
user
)
expect
(
Issue
.
open_for
(
user
).
count
).
to
eq
2
end
...
...
This diff is collapsed.
Click to expand it.
spec/models/merge_request_spec.rb
View file @
8773f339
...
...
@@ -26,6 +26,13 @@ require 'spec_helper'
describe
MergeRequest
do
subject
{
create
(
:merge_request
)
}
describe
'associations'
do
it
{
is_expected
.
to
belong_to
(
:target_project
).
with_foreign_key
(
:target_project_id
).
class_name
(
'Project'
)
}
it
{
is_expected
.
to
belong_to
(
:source_project
).
with_foreign_key
(
:source_project_id
).
class_name
(
'Project'
)
}
it
{
is_expected
.
to
have_one
(
:merge_request_diff
).
dependent
(
:destroy
)
}
end
describe
'modules'
do
subject
{
described_class
}
...
...
@@ -36,22 +43,12 @@ describe MergeRequest do
it
{
is_expected
.
to
include_module
(
Taskable
)
}
end
describe
'associations'
do
it
{
is_expected
.
to
belong_to
(
:target_project
).
with_foreign_key
(
:target_project_id
).
class_name
(
'Project'
)
}
it
{
is_expected
.
to
belong_to
(
:source_project
).
with_foreign_key
(
:source_project_id
).
class_name
(
'Project'
)
}
it
{
is_expected
.
to
have_one
(
:merge_request_diff
).
dependent
(
:destroy
)
}
end
describe
'validation'
do
it
{
is_expected
.
to
validate_presence_of
(
:target_branch
)
}
it
{
is_expected
.
to
validate_presence_of
(
:source_branch
)
}
end
describe
"Mass assignment"
do
end
describe
"Respond to"
do
describe
'respond to'
do
it
{
is_expected
.
to
respond_to
(
:unchecked?
)
}
it
{
is_expected
.
to
respond_to
(
:can_be_merged?
)
}
it
{
is_expected
.
to
respond_to
(
:cannot_be_merged?
)
}
...
...
@@ -83,8 +80,6 @@ describe MergeRequest do
end
end
subject
{
create
(
:merge_request
)
}
describe
'#is_being_reassigned?'
do
it
'returns true if the merge_request assignee has changed'
do
subject
.
assignee
=
create
(
:user
)
...
...
This diff is collapsed.
Click to expand it.
spec/models/snippet_spec.rb
View file @
8773f339
...
...
@@ -30,22 +30,22 @@ describe Snippet do
describe
'associations'
do
it
{
is_expected
.
to
belong_to
(
:author
).
class_name
(
'User'
)
}
it
{
is_expected
.
to
belong_to
(
:project
)
}
it
{
is_expected
.
to
have_many
(
:notes
).
dependent
(
:destroy
)
}
end
describe
"Mass assignment"
do
end
describe
"Validation"
do
describe
'validation'
do
it
{
is_expected
.
to
validate_presence_of
(
:author
)
}
it
{
is_expected
.
to
validate_presence_of
(
:title
)
}
it
{
is_expected
.
to
ensure_length_of
(
:title
).
is_within
(
0
..
255
)
}
it
{
is_expected
.
to
validate_presence_of
(
:file_name
)
}
it
{
is_expected
.
to
ensure_length_of
(
:
titl
e
).
is_within
(
0
..
255
)
}
it
{
is_expected
.
to
ensure_length_of
(
:
file_nam
e
).
is_within
(
0
..
255
)
}
it
{
is_expected
.
to
validate_presence_of
(
:content
)
}
it
{
is_expected
.
to
validate_inclusion_of
(
:visibility_level
).
in_array
(
Gitlab
::
VisibilityLevel
.
values
)
}
end
describe
'#to_reference'
do
...
...
This diff is collapsed.
Click to expand it.
spec/models/user_spec.rb
View file @
8773f339
...
...
@@ -89,9 +89,6 @@ describe User do
it
{
is_expected
.
to
have_many
(
:identities
).
dependent
(
:destroy
)
}
end
describe
"Mass assignment"
do
end
describe
'validations'
do
it
{
is_expected
.
to
validate_presence_of
(
:username
)
}
it
{
is_expected
.
to
validate_presence_of
(
:projects_limit
)
}
...
...
This diff is collapsed.
Click to expand it.
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