Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
b0df7b31052e
Commit
ccf0686b
authored
Jan 02, 2013
by
Dmitriy Zaporozhets
Browse files
Fix api specs. Use id instead path
parent
e1ec5e234f58
Changes
8
Hide whitespace changes
Inline
Side-by-side
app/controllers/search_controller.rb
View file @
b0df7b31
class
SearchController
<
ApplicationController
def
show
result
=
SearchContext
.
new
(
current_user
.
project_
id
s
,
params
).
execute
result
=
SearchContext
.
new
(
current_user
.
authorized_projects
.
map
(
&
:
id
)
,
params
).
execute
@projects
=
result
[
:projects
]
@merge_requests
=
result
[
:merge_requests
]
...
...
spec/lib/project_mover_spec.rb
View file @
b0df7b31
...
...
@@ -5,6 +5,7 @@
before
do
FileUtils
.
rm_rf
base_path
if
File
.
exists?
base_path
FileUtils
.
mkdir_p
base_path
Gitlab
.
config
.
gitolite
.
stub
(
repos_path:
base_path
)
...
...
spec/observers/user_observer_spec.rb
View file @
b0df7b31
...
...
@@ -6,10 +6,7 @@
it
'calls #after_create when new users are created'
do
new_user
=
build
(
:user
)
subject
.
should_receive
(
:after_create
).
with
(
new_user
)
User
.
observers
.
enable
:user_observer
do
new_user
.
save
end
new_user
.
save
end
context
'when a new user is created'
do
...
...
spec/observers/users_project_observer_spec.rb
View file @
b0df7b31
...
...
@@ -11,9 +11,7 @@
describe
"#after_commit"
do
it
"should called when UsersProject created"
do
subject
.
should_receive
(
:after_commit
).
once
UsersProject
.
observers
.
enable
:users_project_observer
do
create
(
:users_project
)
end
create
(
:users_project
)
end
it
"should send email to user"
do
...
...
@@ -36,9 +34,7 @@
describe
"#after_update"
do
it
"should called when UsersProject updated"
do
subject
.
should_receive
(
:after_commit
).
once
UsersProject
.
observers
.
enable
:users_project_observer
do
create
(
:users_project
).
update_attribute
(
:project_access
,
UsersProject
::
MASTER
)
end
create
(
:users_project
).
update_attribute
(
:project_access
,
UsersProject
::
MASTER
)
end
it
"should send email to user"
do
...
...
@@ -47,19 +43,14 @@
end
it
"should not called after UsersProject destroyed"
do
subject
.
should_not_receive
(
:after_commit
)
UsersProject
.
observers
.
enable
:users_project_observer
do
users_project
.
destroy
end
users_project
.
destroy
end
end
describe
"#after_destroy"
do
it
"should called when UsersProject destroyed"
do
subject
.
should_receive
(
:after_destroy
)
UsersProject
.
observers
.
enable
:users_project_observer
do
create
(
:users_project
).
destroy
end
create
(
:users_project
).
destroy
end
it
"should create new event"
do
...
...
spec/requests/api/issues_spec.rb
View file @
b0df7b31
...
...
@@ -28,7 +28,7 @@
describe
"GET /projects/:id/issues"
do
it
"should return project issues"
do
get
api
(
"/projects/
#{
project
.
path
}
/issues"
,
user
)
get
api
(
"/projects/
#{
project
.
id
}
/issues"
,
user
)
response
.
status
.
should
==
200
json_response
.
should
be_an
Array
json_response
.
first
[
'title'
].
should
==
issue
.
title
...
...
@@ -37,7 +37,7 @@
describe
"GET /projects/:id/issues/:issue_id"
do
it
"should return a project issue by id"
do
get
api
(
"/projects/
#{
project
.
path
}
/issues/
#{
issue
.
id
}
"
,
user
)
get
api
(
"/projects/
#{
project
.
id
}
/issues/
#{
issue
.
id
}
"
,
user
)
response
.
status
.
should
==
200
json_response
[
'title'
].
should
==
issue
.
title
end
...
...
@@ -45,7 +45,7 @@
describe
"POST /projects/:id/issues"
do
it
"should create a new project issue"
do
post
api
(
"/projects/
#{
project
.
path
}
/issues"
,
user
),
post
api
(
"/projects/
#{
project
.
id
}
/issues"
,
user
),
title:
'new issue'
,
labels:
'label, label2'
response
.
status
.
should
==
201
json_response
[
'title'
].
should
==
'new issue'
...
...
@@ -56,7 +56,7 @@
describe
"PUT /projects/:id/issues/:issue_id"
do
it
"should update a project issue"
do
put
api
(
"/projects/
#{
project
.
path
}
/issues/
#{
issue
.
id
}
"
,
user
),
put
api
(
"/projects/
#{
project
.
id
}
/issues/
#{
issue
.
id
}
"
,
user
),
title:
'updated title'
,
labels:
'label2'
,
closed:
1
response
.
status
.
should
==
200
json_response
[
'title'
].
should
==
'updated title'
...
...
@@ -67,7 +67,7 @@
describe
"DELETE /projects/:id/issues/:issue_id"
do
it
"should delete a project issue"
do
delete
api
(
"/projects/
#{
project
.
path
}
/issues/
#{
issue
.
id
}
"
,
user
)
delete
api
(
"/projects/
#{
project
.
id
}
/issues/
#{
issue
.
id
}
"
,
user
)
response
.
status
.
should
==
405
end
end
...
...
spec/requests/api/merge_requests_spec.rb
View file @
b0df7b31
...
...
@@ -11,14 +11,14 @@
describe
"GET /projects/:id/merge_requests"
do
context
"when unauthenticated"
do
it
"should return authentication error"
do
get
api
(
"/projects/
#{
project
.
path
}
/merge_requests"
)
get
api
(
"/projects/
#{
project
.
id
}
/merge_requests"
)
response
.
status
.
should
==
401
end
end
context
"when authenticated"
do
it
"should return an array of merge_requests"
do
get
api
(
"/projects/
#{
project
.
path
}
/merge_requests"
,
user
)
get
api
(
"/projects/
#{
project
.
id
}
/merge_requests"
,
user
)
response
.
status
.
should
==
200
json_response
.
should
be_an
Array
json_response
.
first
[
'title'
].
should
==
merge_request
.
title
...
...
@@ -28,7 +28,7 @@
describe
"GET /projects/:id/merge_request/:merge_request_id"
do
it
"should return merge_request"
do
get
api
(
"/projects/
#{
project
.
path
}
/merge_request/
#{
merge_request
.
id
}
"
,
user
)
get
api
(
"/projects/
#{
project
.
id
}
/merge_request/
#{
merge_request
.
id
}
"
,
user
)
response
.
status
.
should
==
200
json_response
[
'title'
].
should
==
merge_request
.
title
end
...
...
@@ -36,7 +36,7 @@
describe
"POST /projects/:id/merge_requests"
do
it
"should return merge_request"
do
post
api
(
"/projects/
#{
project
.
path
}
/merge_requests"
,
user
),
post
api
(
"/projects/
#{
project
.
id
}
/merge_requests"
,
user
),
title:
'Test merge_request'
,
source_branch:
"stable"
,
target_branch:
"master"
,
author:
user
response
.
status
.
should
==
201
json_response
[
'title'
].
should
==
'Test merge_request'
...
...
@@ -45,7 +45,7 @@
describe
"PUT /projects/:id/merge_request/:merge_request_id"
do
it
"should return merge_request"
do
put
api
(
"/projects/
#{
project
.
path
}
/merge_request/
#{
merge_request
.
id
}
"
,
user
),
title:
"New title"
put
api
(
"/projects/
#{
project
.
id
}
/merge_request/
#{
merge_request
.
id
}
"
,
user
),
title:
"New title"
response
.
status
.
should
==
200
json_response
[
'title'
].
should
==
'New title'
end
...
...
@@ -53,7 +53,7 @@
describe
"POST /projects/:id/merge_request/:merge_request_id/comments"
do
it
"should return comment"
do
post
api
(
"/projects/
#{
project
.
path
}
/merge_request/
#{
merge_request
.
id
}
/comments"
,
user
),
note:
"My comment"
post
api
(
"/projects/
#{
project
.
id
}
/merge_request/
#{
merge_request
.
id
}
/comments"
,
user
),
note:
"My comment"
response
.
status
.
should
==
201
json_response
[
'note'
].
should
==
'My comment'
end
...
...
spec/requests/api/milestones_spec.rb
View file @
b0df7b31
...
...
@@ -11,7 +11,7 @@
describe
"GET /projects/:id/milestones"
do
it
"should return project milestones"
do
get
api
(
"/projects/
#{
project
.
path
}
/milestones"
,
user
)
get
api
(
"/projects/
#{
project
.
id
}
/milestones"
,
user
)
response
.
status
.
should
==
200
json_response
.
should
be_an
Array
json_response
.
first
[
'title'
].
should
==
milestone
.
title
...
...
@@ -20,7 +20,7 @@
describe
"GET /projects/:id/milestones/:milestone_id"
do
it
"should return a project milestone by id"
do
get
api
(
"/projects/
#{
project
.
path
}
/milestones/
#{
milestone
.
id
}
"
,
user
)
get
api
(
"/projects/
#{
project
.
id
}
/milestones/
#{
milestone
.
id
}
"
,
user
)
response
.
status
.
should
==
200
json_response
[
'title'
].
should
==
milestone
.
title
end
...
...
@@ -28,7 +28,7 @@
describe
"POST /projects/:id/milestones"
do
it
"should create a new project milestone"
do
post
api
(
"/projects/
#{
project
.
path
}
/milestones"
,
user
),
post
api
(
"/projects/
#{
project
.
id
}
/milestones"
,
user
),
title:
'new milestone'
response
.
status
.
should
==
201
json_response
[
'title'
].
should
==
'new milestone'
...
...
@@ -38,7 +38,7 @@
describe
"PUT /projects/:id/milestones/:milestone_id"
do
it
"should update a project milestone"
do
put
api
(
"/projects/
#{
project
.
path
}
/milestones/
#{
milestone
.
id
}
"
,
user
),
put
api
(
"/projects/
#{
project
.
id
}
/milestones/
#{
milestone
.
id
}
"
,
user
),
title:
'updated title'
response
.
status
.
should
==
200
json_response
[
'title'
].
should
==
'updated title'
...
...
spec/spec_helper.rb
View file @
b0df7b31
...
...
@@ -37,13 +37,10 @@
config
.
before
do
stub_gitolite!
# !!! Observers disabled by default in tests
#ActiveRecord::Base.observers.disable(:all)
# ActiveRecord::Base.observers.enable(:all)
# Use tmp dir for FS manipulations
Gitlab
.
config
.
gitolite
.
stub
(
repos_path:
Rails
.
root
.
join
(
'tmp'
,
'test-git-base-path'
))
FileUtils
.
rm_rf
Gitlab
.
config
.
gitolite
.
repos_path
FileUtils
.
mkdir_p
Gitlab
.
config
.
gitolite
.
repos_path
temp_repos_path
=
Rails
.
root
.
join
(
'tmp'
,
'test-git-base-path'
)
Gitlab
.
config
.
gitolite
.
stub
(
repos_path:
temp_repos_path
)
FileUtils
.
rm_rf
temp_repos_path
FileUtils
.
mkdir_p
temp_repos_path
end
end
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