Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
projects.thm.de
GitLab
Commits
80fb38de
Commit
80fb38de
authored
Nov 06, 2012
by
Vincent Bonmalais
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove backward compatibility of factories.
parent
d52f06f3
Changes
54
Hide whitespace changes
Inline
Side-by-side
Showing
54 changed files
with
261 additions
and
279 deletions
+261
-279
features/steps/dashboard/dashboard.rb
features/steps/dashboard/dashboard.rb
+4
-4
features/steps/dashboard/dashboard_search.rb
features/steps/dashboard/dashboard_search.rb
+1
-1
features/steps/group/group.rb
features/steps/group/group.rb
+3
-3
features/steps/profile/profile.rb
features/steps/profile/profile.rb
+1
-1
features/steps/profile/profile_ssh_keys.rb
features/steps/profile/profile_ssh_keys.rb
+1
-1
features/steps/project/project_hooks.rb
features/steps/project/project_hooks.rb
+1
-1
features/steps/project/project_issues.rb
features/steps/project/project_issues.rb
+13
-13
features/steps/project/project_labels.rb
features/steps/project/project_labels.rb
+1
-1
features/steps/project/project_merge_requests.rb
features/steps/project/project_merge_requests.rb
+9
-9
features/steps/project/project_milestones.rb
features/steps/project/project_milestones.rb
+2
-2
features/steps/project/project_team_management.rb
features/steps/project/project_team_management.rb
+3
-3
features/steps/shared/project.rb
features/steps/shared/project.rb
+1
-1
spec/factories.rb
spec/factories.rb
+0
-18
spec/mailers/notify_spec.rb
spec/mailers/notify_spec.rb
+20
-20
spec/models/event_spec.rb
spec/models/event_spec.rb
+1
-1
spec/models/issue_spec.rb
spec/models/issue_spec.rb
+4
-4
spec/models/key_spec.rb
spec/models/key_spec.rb
+2
-2
spec/models/merge_request_spec.rb
spec/models/merge_request_spec.rb
+7
-7
spec/models/milestone_spec.rb
spec/models/milestone_spec.rb
+2
-2
spec/models/note_spec.rb
spec/models/note_spec.rb
+18
-18
spec/models/project_hooks_spec.rb
spec/models/project_hooks_spec.rb
+8
-8
spec/models/project_security_spec.rb
spec/models/project_security_spec.rb
+3
-3
spec/models/project_spec.rb
spec/models/project_spec.rb
+11
-11
spec/models/system_hook_spec.rb
spec/models/system_hook_spec.rb
+9
-9
spec/models/user_spec.rb
spec/models/user_spec.rb
+1
-1
spec/models/web_hook_spec.rb
spec/models/web_hook_spec.rb
+2
-2
spec/observers/activity_observer_spec.rb
spec/observers/activity_observer_spec.rb
+9
-9
spec/observers/issue_observer_spec.rb
spec/observers/issue_observer_spec.rb
+2
-2
spec/observers/merge_request_observer_spec.rb
spec/observers/merge_request_observer_spec.rb
+2
-2
spec/observers/note_observer_spec.rb
spec/observers/note_observer_spec.rb
+1
-1
spec/observers/user_observer_spec.rb
spec/observers/user_observer_spec.rb
+1
-1
spec/observers/users_project_observer_spec.rb
spec/observers/users_project_observer_spec.rb
+7
-7
spec/requests/admin/admin_hooks_spec.rb
spec/requests/admin/admin_hooks_spec.rb
+4
-4
spec/requests/admin/admin_projects_spec.rb
spec/requests/admin/admin_projects_spec.rb
+4
-4
spec/requests/admin/admin_users_spec.rb
spec/requests/admin/admin_users_spec.rb
+5
-5
spec/requests/api/issues_spec.rb
spec/requests/api/issues_spec.rb
+3
-3
spec/requests/api/merge_requests_spec.rb
spec/requests/api/merge_requests_spec.rb
+8
-8
spec/requests/api/milestones_spec.rb
spec/requests/api/milestones_spec.rb
+3
-3
spec/requests/api/projects_spec.rb
spec/requests/api/projects_spec.rb
+9
-9
spec/requests/api/session_spec.rb
spec/requests/api/session_spec.rb
+1
-1
spec/requests/api/users_spec.rb
spec/requests/api/users_spec.rb
+6
-6
spec/requests/atom/dashboard_issues_spec.rb
spec/requests/atom/dashboard_issues_spec.rb
+5
-5
spec/requests/atom/dashboard_spec.rb
spec/requests/atom/dashboard_spec.rb
+1
-1
spec/requests/atom/issues_spec.rb
spec/requests/atom/issues_spec.rb
+3
-3
spec/requests/gitlab_flavored_markdown_spec.rb
spec/requests/gitlab_flavored_markdown_spec.rb
+19
-19
spec/requests/issues_spec.rb
spec/requests/issues_spec.rb
+17
-17
spec/requests/projects_deploy_keys_spec.rb
spec/requests/projects_deploy_keys_spec.rb
+3
-3
spec/requests/projects_spec.rb
spec/requests/projects_spec.rb
+5
-5
spec/requests/search_spec.rb
spec/requests/search_spec.rb
+2
-2
spec/requests/security/profile_access_spec.rb
spec/requests/security/profile_access_spec.rb
+1
-1
spec/requests/snippets_spec.rb
spec/requests/snippets_spec.rb
+7
-7
spec/support/login_helpers.rb
spec/support/login_helpers.rb
+1
-1
spec/support/matchers.rb
spec/support/matchers.rb
+2
-2
spec/workers/post_receive_spec.rb
spec/workers/post_receive_spec.rb
+2
-2
No files found.
features/steps/dashboard/dashboard.rb
View file @
80fb38de
...
...
@@ -32,7 +32,7 @@ class Dashboard < Spinach::FeatureSteps
end
Given
'user with name "John Doe" joined project "Shop"'
do
user
=
create
:user
,
{
name:
"John Doe"
}
user
=
create
(
:user
,
{
name:
"John Doe"
}
)
project
=
Project
.
find_by_name
"Shop"
Event
.
create
(
project:
project
,
...
...
@@ -65,9 +65,9 @@ class Dashboard < Spinach::FeatureSteps
end
And
'I have group with projects'
do
@group
=
create
:group
@project
=
create
:project
,
group:
@group
@event
=
create
:closed_issue_event
,
project:
@project
@group
=
create
(
:group
)
@project
=
create
(
:project
,
group:
@group
)
@event
=
create
(
:closed_issue_event
,
project:
@project
)
@project
.
add_access
current_user
,
:admin
end
...
...
features/steps/dashboard/dashboard_search.rb
View file @
80fb38de
...
...
@@ -12,7 +12,7 @@ class DashboardSearch < Spinach::FeatureSteps
end
And
'I own project "Shop"'
do
@project
=
create
:project
,
name
:
"Shop"
@project
=
create
(
:project
,
:
name
=>
"Shop"
)
@project
.
add_access
(
@user
,
:admin
)
end
...
...
features/steps/group/group.rb
View file @
80fb38de
...
...
@@ -9,9 +9,9 @@ class Groups < Spinach::FeatureSteps
end
And
'I have group with projects'
do
@group
=
Factory
:group
@project
=
Factory
:project
,
group:
@group
@event
=
Factory
:closed_issue_event
,
project:
@project
@group
=
create
(
:group
)
@project
=
create
(
:project
,
group:
@group
)
@event
=
create
(
:closed_issue_event
,
project:
@project
)
@project
.
add_access
current_user
,
:admin
end
...
...
features/steps/profile/profile.rb
View file @
80fb38de
...
...
@@ -53,7 +53,7 @@ class Profile < Spinach::FeatureSteps
end
Given
'I have activity'
do
Factory
:closed_issue_event
,
author:
current_user
create
(
:closed_issue_event
,
author:
current_user
)
end
Then
'I should see my activity'
do
...
...
features/steps/profile/profile_ssh_keys.rb
View file @
80fb38de
...
...
@@ -43,6 +43,6 @@ class ProfileSshKeys < Spinach::FeatureSteps
end
And
'I have ssh key "ssh-rsa Work"'
do
Factory
:key
,
:user
=>
@user
,
:title
=>
"ssh-rsa Work"
,
:key
=>
"jfKLJDFKSFJSHFJssh-rsa Work"
create
(
:key
,
:user
=>
@user
,
:title
=>
"ssh-rsa Work"
,
:key
=>
"jfKLJDFKSFJSHFJssh-rsa Work"
)
end
end
features/steps/project/project_hooks.rb
View file @
80fb38de
...
...
@@ -6,7 +6,7 @@ class ProjectHooks < Spinach::FeatureSteps
include
RSpec
::
Mocks
::
ExampleMethods
Given
'project has hook'
do
@hook
=
Factory
:project_hook
,
project:
current_project
@hook
=
create
(
:project_hook
,
project:
current_project
)
end
Then
'I should see project hook'
do
...
...
features/steps/project/project_issues.rb
View file @
80fb38de
...
...
@@ -79,16 +79,16 @@ class ProjectIssues < Spinach::FeatureSteps
Given
'project "Shop" has milestone "v2.2"'
do
project
=
Project
.
find_by_name
(
"Shop"
)
milestone
=
Factory
:milestone
,
:title
=>
"v2.2"
,
:project
=>
project
milestone
=
create
(
:milestone
,
:title
=>
"v2.2"
,
:project
=>
project
)
3
.
times
{
Factory
:issue
,
:project
=>
project
,
:milestone
=>
milestone
}
3
.
times
{
create
(
:issue
,
:project
=>
project
,
:milestone
=>
milestone
)
}
end
And
'project "Shop" has milestone "v3.0"'
do
project
=
Project
.
find_by_name
(
"Shop"
)
milestone
=
Factory
:milestone
,
:title
=>
"v3.0"
,
:project
=>
project
milestone
=
create
(
:milestone
,
:title
=>
"v3.0"
,
:project
=>
project
)
3
.
times
{
Factory
:issue
,
:project
=>
project
,
:milestone
=>
milestone
}
3
.
times
{
create
(
:issue
,
:project
=>
project
,
:milestone
=>
milestone
)
}
end
When
'I select milestone "v3.0"'
do
...
...
@@ -117,18 +117,18 @@ class ProjectIssues < Spinach::FeatureSteps
And
'project "Shop" have "Release 0.4" open issue'
do
project
=
Project
.
find_by_name
(
"Shop"
)
Factory
.
create
(
:issue
,
:title
=>
"Release 0.4"
,
:project
=>
project
,
:author
=>
project
.
users
.
first
)
create
(
:issue
,
:title
=>
"Release 0.4"
,
:project
=>
project
,
:author
=>
project
.
users
.
first
)
end
And
'project "Shop" have "Release 0.3" closed issue'
do
project
=
Project
.
find_by_name
(
"Shop"
)
Factory
.
create
(
:issue
,
:title
=>
"Release 0.3"
,
:project
=>
project
,
:author
=>
project
.
users
.
first
,
:closed
=>
true
)
create
(
:issue
,
:title
=>
"Release 0.3"
,
:project
=>
project
,
:author
=>
project
.
users
.
first
,
:closed
=>
true
)
end
end
features/steps/project/project_labels.rb
View file @
80fb38de
...
...
@@ -18,7 +18,7 @@ class ProjectLabels < Spinach::FeatureSteps
And
'project "Shop" have issues tags: "bug", "feature"'
do
project
=
Project
.
find_by_name
(
"Shop"
)
[
'bug'
,
'feature'
].
each
do
|
label
|
Factory
:issue
,
project:
project
,
label_list:
label
create
(
:issue
,
project:
project
,
label_list:
label
)
end
end
end
features/steps/project/project_merge_requests.rb
View file @
80fb38de
...
...
@@ -63,18 +63,18 @@ class ProjectMergeRequests < Spinach::FeatureSteps
And
'project "Shop" have "Bug NS-04" open merge request'
do
project
=
Project
.
find_by_name
(
"Shop"
)
Factory
.
create
(
:merge_request
,
:title
=>
"Bug NS-04"
,
:project
=>
project
,
:author
=>
project
.
users
.
first
)
create
(
:merge_request
,
:title
=>
"Bug NS-04"
,
:project
=>
project
,
:author
=>
project
.
users
.
first
)
end
And
'project "Shop" have "Feature NS-03" closed merge request'
do
project
=
Project
.
find_by_name
(
"Shop"
)
Factory
.
create
(
:merge_request
,
:title
=>
"Feature NS-03"
,
:project
=>
project
,
:author
=>
project
.
users
.
first
,
:closed
=>
true
)
create
(
:merge_request
,
:title
=>
"Feature NS-03"
,
:project
=>
project
,
:author
=>
project
.
users
.
first
,
:closed
=>
true
)
end
end
features/steps/project/project_milestones.rb
View file @
80fb38de
...
...
@@ -32,9 +32,9 @@ class ProjectMilestones < Spinach::FeatureSteps
And
'project "Shop" has milestone "v2.2"'
do
project
=
Project
.
find_by_name
(
"Shop"
)
milestone
=
Factory
:milestone
,
:title
=>
"v2.2"
,
:project
=>
project
milestone
=
create
(
:milestone
,
:title
=>
"v2.2"
,
:project
=>
project
)
3
.
times
{
Factory
:issue
,
:project
=>
project
,
:milestone
=>
milestone
}
3
.
times
{
create
(
:issue
,
:project
=>
project
,
:milestone
=>
milestone
)
}
end
Given
'the milestone has open and closed issues'
do
...
...
features/steps/project/project_team_management.rb
View file @
80fb38de
...
...
@@ -74,11 +74,11 @@ class ProjectTeamManagement < Spinach::FeatureSteps
end
And
'gitlab user "Mike"'
do
Factory
:user
,
:name
=>
"Mike"
create
(
:user
,
:name
=>
"Mike"
)
end
And
'gitlab user "Sam"'
do
Factory
:user
,
:name
=>
"Sam"
create
(
:user
,
:name
=>
"Sam"
)
end
And
'"Sam" is "Shop" developer'
do
...
...
@@ -88,7 +88,7 @@ class ProjectTeamManagement < Spinach::FeatureSteps
end
Given
'I own project "Website"'
do
@project
=
Factory
:project
,
:name
=>
"Website"
@project
=
create
(
:project
,
:name
=>
"Website"
)
@project
.
add_access
(
@user
,
:admin
)
end
...
...
features/steps/shared/project.rb
View file @
80fb38de
...
...
@@ -9,7 +9,7 @@ module SharedProject
# Create a specific project called "Shop"
And
'I own project "Shop"'
do
@project
=
Factory
:project
,
:name
=>
"Shop"
@project
=
create
(
:project
,
:name
=>
"Shop"
)
@project
.
add_access
(
@user
,
:admin
)
end
...
...
spec/factories.rb
View file @
80fb38de
# Backwards compatibility with the old method
def
Factory
(
type
,
*
args
)
FactoryGirl
.
create
(
type
,
*
args
)
end
module
Factory
def
self
.
create
(
type
,
*
args
)
FactoryGirl
.
create
(
type
,
*
args
)
end
def
self
.
new
(
type
,
*
args
)
FactoryGirl
.
build
(
type
,
*
args
)
end
def
self
.
attributes
(
type
,
*
args
)
FactoryGirl
.
attributes_for
(
type
,
*
args
)
end
end
FactoryGirl
.
define
do
sequence
:sentence
,
aliases:
[
:title
,
:content
]
do
Faker
::
Lorem
.
sentence
...
...
spec/mailers/notify_spec.rb
View file @
80fb38de
...
...
@@ -4,8 +4,8 @@
include
EmailSpec
::
Helpers
include
EmailSpec
::
Matchers
let
(
:recipient
)
{
Factory
.
create
(
:user
,
email:
'recipient@example.com'
)
}
let
(
:project
)
{
Factory
.
create
(
:project
)
}
let
(
:recipient
)
{
create
(
:user
,
email:
'recipient@example.com'
)
}
let
(
:project
)
{
create
(
:project
)
}
shared_examples
'a multiple recipients email'
do
it
'is sent to the given recipient'
do
...
...
@@ -15,7 +15,7 @@
describe
'for new users, the email'
do
let
(
:example_site_path
)
{
root_path
}
let
(
:new_user
)
{
Factory
.
create
(
:user
,
email:
'newguy@example.com'
)
}
let
(
:new_user
)
{
create
(
:user
,
email:
'newguy@example.com'
)
}
subject
{
Notify
.
new_user_email
(
new_user
.
id
,
new_user
.
password
)
}
...
...
@@ -42,8 +42,8 @@
context
'for a project'
do
describe
'items that are assignable, the email'
do
let
(
:assignee
)
{
Factory
.
create
(
:user
,
email:
'assignee@example.com'
)
}
let
(
:previous_assignee
)
{
Factory
.
create
(
:user
,
name:
'Previous Assignee'
)
}
let
(
:assignee
)
{
create
(
:user
,
email:
'assignee@example.com'
)
}
let
(
:previous_assignee
)
{
create
(
:user
,
name:
'Previous Assignee'
)
}
shared_examples
'an assignee email'
do
it
'is sent to the assignee'
do
...
...
@@ -52,7 +52,7 @@
end
context
'for issues'
do
let
(
:issue
)
{
Factory
.
create
(
:issue
,
assignee:
assignee
,
project:
project
)
}
let
(
:issue
)
{
create
(
:issue
,
assignee:
assignee
,
project:
project
)
}
describe
'that are new'
do
subject
{
Notify
.
new_issue_email
(
issue
.
id
)
}
...
...
@@ -93,10 +93,10 @@
end
describe
'status changed'
do
let
(
:current_user
)
{
Factory
.
create
:user
,
email:
"current@email.com"
}
let
(
:current_user
)
{
create
(
:user
,
email:
"current@email.com"
)
}
let
(
:status
)
{
'closed'
}
subject
{
Notify
.
issue_status_changed_email
(
recipient
.
id
,
issue
.
id
,
status
,
current_user
)
}
it
'has the correct subject'
do
should
have_subject
/changed issue #
#{
issue
.
id
}
\|
#{
issue
.
title
}
/i
end
...
...
@@ -117,7 +117,7 @@
end
context
'for merge requests'
do
let
(
:merge_request
)
{
Factory
.
create
(
:merge_request
,
assignee:
assignee
,
project:
project
)
}
let
(
:merge_request
)
{
create
(
:merge_request
,
assignee:
assignee
,
project:
project
)
}
describe
'that are new'
do
subject
{
Notify
.
new_merge_request_email
(
merge_request
.
id
)
}
...
...
@@ -169,13 +169,13 @@
end
describe
'project access changed'
do
let
(
:project
)
{
Factory
.
create
(
:project
,
path:
"Fuu"
,
code:
"Fuu"
)
}
let
(
:user
)
{
Factory
.
create
:user
}
let
(
:users_project
)
{
Factory
.
create
(
:users_project
,
project:
project
,
user:
user
)
}
let
(
:project
)
{
create
(
:project
,
path:
"Fuu"
,
code:
"Fuu"
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:users_project
)
{
create
(
:users_project
,
project:
project
,
user:
user
)
}
subject
{
Notify
.
project_access_granted_email
(
users_project
.
id
)
}
it
'has the correct subject'
do
should
have_subject
/access to project was granted/
...
...
@@ -189,8 +189,8 @@
end
context
'items that are noteable, the email for a note'
do
let
(
:note_author
)
{
Factory
.
create
(
:user
,
name:
'author_name'
)
}
let
(
:note
)
{
Factory
.
create
(
:note
,
project:
project
,
author:
note_author
)
}
let
(
:note_author
)
{
create
(
:user
,
name:
'author_name'
)
}
let
(
:note
)
{
create
(
:note
,
project:
project
,
author:
note_author
)
}
before
:each
do
Note
.
stub
(
:find
).
with
(
note
.
id
).
and_return
(
note
)
...
...
@@ -251,7 +251,7 @@
end
describe
'on a merge request'
do
let
(
:merge_request
)
{
Factory
.
create
(
:merge_request
,
project:
project
)
}
let
(
:merge_request
)
{
create
(
:merge_request
,
project:
project
)
}
let
(
:note_on_merge_request_path
)
{
project_merge_request_path
(
project
,
merge_request
,
anchor:
"note_
#{
note
.
id
}
"
)
}
before
(
:each
)
{
note
.
stub
(
:noteable
).
and_return
(
merge_request
)
}
...
...
@@ -269,7 +269,7 @@
end
describe
'on an issue'
do
let
(
:issue
)
{
Factory
.
create
(
:issue
,
project:
project
)
}
let
(
:issue
)
{
create
(
:issue
,
project:
project
)
}
let
(
:note_on_issue_path
)
{
project_issue_path
(
project
,
issue
,
anchor:
"note_
#{
note
.
id
}
"
)
}
before
(
:each
)
{
note
.
stub
(
:noteable
).
and_return
(
issue
)
}
...
...
spec/models/event_spec.rb
View file @
80fb38de
...
...
@@ -32,7 +32,7 @@
describe
"Push event"
do
before
do
project
=
Factory
:project
project
=
create
(
:project
)
@user
=
project
.
owner
data
=
{
...
...
spec/models/issue_spec.rb
View file @
80fb38de
...
...
@@ -38,11 +38,11 @@
it
{
should
include_module
(
Votes
)
}
end
subject
{
Factory
.
create
(
:issue
)
}
subject
{
create
(
:issue
)
}
describe
'#is_being_reassigned?'
do
it
'returns true if the issue assignee has changed'
do
subject
.
assignee
=
Factory
(
:user
)
subject
.
assignee
=
create
(
:user
)
subject
.
is_being_reassigned?
.
should
be_true
end
it
'returns false if the issue assignee has not changed'
do
...
...
@@ -56,7 +56,7 @@
subject
.
is_being_closed?
.
should
be_true
end
it
'returns false if the closed attribute has changed and is now false'
do
issue
=
Factory
.
create
(
:closed_issue
)
issue
=
create
(
:closed_issue
)
issue
.
closed
=
false
issue
.
is_being_closed?
.
should
be_false
end
...
...
@@ -68,7 +68,7 @@
describe
'#is_being_reopened?'
do
it
'returns true if the closed attribute has changed and is now false'
do
issue
=
Factory
.
create
(
:closed_issue
)
issue
=
create
(
:closed_issue
)
issue
.
closed
=
false
issue
.
is_being_reopened?
.
should
be_true
end
...
...
spec/models/key_spec.rb
View file @
80fb38de
...
...
@@ -53,7 +53,7 @@
end
context
"as a personal key"
do
let
(
:user
)
{
Factory
.
create
(
:user
)
}
let
(
:user
)
{
create
(
:user
)
}
it
"accepts the key once"
do
build
(
:key
,
user:
user
).
should
be_valid
...
...
@@ -67,7 +67,7 @@
end
context
"validate it is a fingerprintable key"
do
let
(
:user
)
{
Factory
.
create
(
:user
)
}
let
(
:user
)
{
create
(
:user
)
}
it
"accepts the fingerprintable key"
do
build
(
:key
,
user:
user
).
should
be_valid
...
...
spec/models/merge_request_spec.rb
View file @
80fb38de
...
...
@@ -37,12 +37,12 @@
end
describe
"#mr_and_commit_notes"
do
let!
(
:merge_request
)
{
Factory
.
create
(
:merge_request
)
}
let!
(
:merge_request
)
{
create
(
:merge_request
)
}
before
do
merge_request
.
stub
(
:commits
)
{
[
merge_request
.
project
.
commit
]
}
Factory
.
create
(
:note
,
noteable:
merge_request
.
commits
.
first
)
Factory
.
create
(
:note
,
noteable:
merge_request
)
create
(
:note
,
noteable:
merge_request
.
commits
.
first
)
create
(
:note
,
noteable:
merge_request
)
end
it
"should include notes for commits"
do
...
...
@@ -51,11 +51,11 @@
end
end
subject
{
Factory
.
create
(
:merge_request
)
}
subject
{
create
(
:merge_request
)
}
describe
'#is_being_reassigned?'
do
it
'returns true if the merge_request assignee has changed'
do
subject
.
assignee
=
Factory
(
:user
)
subject
.
assignee
=
create
(
:user
)
subject
.
is_being_reassigned?
.
should
be_true
end
it
'returns false if the merge request assignee has not changed'
do
...
...
@@ -69,7 +69,7 @@
subject
.
is_being_closed?
.
should
be_true
end
it
'returns false if the closed attribute has changed and is now false'
do
merge_request
=
Factory
.
create
(
:closed_merge_request
)
merge_request
=
create
(
:closed_merge_request
)
merge_request
.
closed
=
false
merge_request
.
is_being_closed?
.
should
be_false
end
...
...
@@ -81,7 +81,7 @@
describe
'#is_being_reopened?'
do
it
'returns true if the closed attribute has changed and is now false'
do
merge_request
=
Factory
.
create
(
:closed_merge_request
)
merge_request
=
create
(
:closed_merge_request
)
merge_request
.
closed
=
false
merge_request
.
is_being_reopened?
.
should
be_true
end
...
...
spec/models/milestone_spec.rb
View file @
80fb38de
...
...
@@ -30,8 +30,8 @@
it
{
should
ensure_inclusion_of
(
:closed
).
in_array
([
true
,
false
])
}
end
let
(
:milestone
)
{
Factory
:milestone
}
let
(
:issue
)
{
Factory
:issue
}
let
(
:milestone
)
{
create
(
:milestone
)
}
let
(
:issue
)
{
create
(
:issue
)
}
describe
"#percent_complete"
do
it
"should not count open issues"
do
...
...
spec/models/note_spec.rb
View file @
80fb38de
...
...
@@ -40,10 +40,10 @@
end
describe
"Voting score"
do
let
(
:project
)
{
Factory
(
:project
)
}
let
(
:project
)
{
create
(
:project
)
}
it
"recognizes a neutral note"
do
note
=
Factory
(
:note
,
note:
"This is not a +1 note"
)
note
=
create
(
:note
,
note:
"This is not a +1 note"
)
note
.
should_not
be_upvote
note
.
should_not
be_downvote
end
...
...
@@ -55,7 +55,7 @@
end
it
"recognizes a +1 note"
do
note
=
Factory
(
:note
,
note:
"+1 for this"
)
note
=
create
(
:note
,
note:
"+1 for this"
)
note
.
should
be_upvote
end
...
...
@@ -65,7 +65,7 @@
end
it
"recognizes a -1 note"
do
note
=
Factory
(
:note
,
note:
"-1 for this"
)
note
=
create
(
:note
,
note:
"-1 for this"
)
note
.
should
be_downvote
end
...
...
@@ -80,9 +80,9 @@
describe
"Commit notes"
do
before
do
@note
=
Factory
:note
,
noteable_id:
commit
.
id
,
noteable_type:
"Commit"
@note
=
create
(
:note
,
noteable_id:
commit
.
id
,
noteable_type:
"Commit"
)
end
it
"should be accessible through #noteable"
do
...
...
@@ -103,10 +103,10 @@
describe
"Pre-line commit notes"
do
before
do
@note
=
Factory
:note
,
noteable_id:
commit
.
id
,
noteable_type:
"Commit"
,
line_code:
"0_16_1"
@note
=
create
(
:note
,
noteable_id:
commit
.
id
,
noteable_type:
"Commit"
,
line_code:
"0_16_1"
)
end
it
"should save a valid note"
do
...
...
@@ -120,9 +120,9 @@
end
describe
'#create_status_change_note'
do
let
(
:project
)
{
Factory
.
create
(
:project
)
}
let
(
:thing
)
{
Factory
.
create
(
:issue
,
project:
project
)
}
let
(
:author
)
{
Factory
(
:user
)
}
let
(
:project
)
{
create
(
:project
)
}
let
(
:thing
)
{
create
(
:issue
,
project:
project
)
}
let
(
:author
)
{
create
(
:user
)
}
let
(
:status
)
{
'new_status'
}
subject
{
Note
.
create_status_change_note
(
thing
,
author
,
status
)
}
...
...
@@ -141,10 +141,10 @@
describe
:authorization
do
before
do
@p1
=
create
(
:project
)
@p2
=
Factory
:project
@u1
=
Factory
:user
@u2
=
Factory
:user
@u3
=
Factory
:user
@p2
=
create
(
:project
)
@u1
=
create
(
:user
)
@u2
=
create
(
:user
)
@u3
=
create
(
:user
)
@abilities
=
Six
.
new
@abilities
<<
Ability
end
...
...
spec/models/project_hooks_spec.rb
View file @
80fb38de
require
'spec_helper'
describe
Project
,
"Hooks"
do
let
(
:project
)
{
Factory
:project
}
before
do
@key
=
Factory
:key
,
user:
project
.
owner
let
(
:project
)
{
create
(
:project
)
}
before
do
@key
=
create
(
:key
,
user:
project
.
owner
)
@user
=
@key
.
user
@key_id
=
@key
.
identifier
end
describe
"Post Receive Event"
do
it
"should create push event"
do
describe
"Post Receive Event"
do
it
"should create push event"
do
oldrev
,
newrev
,
ref
=
'00000000000000000000000000000000'
,
'newrev'
,
'refs/heads/master'
project
.
observe_push
(
oldrev
,
newrev
,
ref
,
@user
)
event
=
Event
.
last
...
...
@@ -32,8 +32,8 @@
context
"with web hooks"
do
before
do
@project_hook
=
Factory
(
:project_hook
)
@project_hook_2
=
Factory
(
:project_hook
)
@project_hook
=
create
(
:project_hook
)
@project_hook_2
=
create
(
:project_hook
)
project
.
hooks
<<
[
@project_hook
,
@project_hook_2
]
end
...
...
@@ -47,7 +47,7 @@
context
"does not execute web hooks"
do
before
do
@project_hook
=
Factory
(
:project_hook
)
@project_hook
=
create
(
:project_hook
)
project
.
hooks
<<
[
@project_hook
]
end
...
...
spec/models/project_security_spec.rb
View file @
80fb38de
...
...
@@ -3,9 +3,9 @@
describe
Project
do
describe
:authorization
do
before
do
@p1
=
Factory
:project
@u1
=
Factory
:user
@u2
=
Factory
:user
@p1
=
create
(
:project
)
@u1
=
create
(
:user
)
@u2
=
create
(
:user
)