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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
f614ae8e
Commit
f614ae8e
authored
Nov 21, 2012
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Increased test coverage
parent
e9be4b37
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
84 additions
and
42 deletions
+84
-42
app/views/projects/_clone_panel.html.haml
app/views/projects/_clone_panel.html.haml
+3
-3
app/views/snippets/_form.html.haml
app/views/snippets/_form.html.haml
+20
-20
features/support/env.rb
features/support/env.rb
+6
-1
spec/models/group_spec.rb
spec/models/group_spec.rb
+8
-0
spec/models/namespace_spec.rb
spec/models/namespace_spec.rb
+42
-0
spec/spec_helper.rb
spec/spec_helper.rb
+5
-0
spec/support/namespaces_stub.rb
spec/support/namespaces_stub.rb
+0
-18
No files found.
app/views/projects/_clone_panel.html.haml
View file @
f614ae8e
...
@@ -6,12 +6,12 @@
...
@@ -6,12 +6,12 @@
.right
.right
-
unless
@project
.
empty_repo?
-
unless
@project
.
empty_repo?
-
if
can?
current_user
,
:download_code
,
@project
-
if
can?
current_user
,
:download_code
,
@project
=
link_to
archive_project_repository_path
(
@project
),
class:
"btn grouped"
do
=
link_to
archive_project_repository_path
(
@project
),
class:
"btn
-small btn
grouped"
do
%i
.icon-download-alt
%i
.icon-download-alt
Download
Download
-
if
@project
.
merge_requests_enabled
&&
can?
(
current_user
,
:write_merge_request
,
@project
)
-
if
@project
.
merge_requests_enabled
&&
can?
(
current_user
,
:write_merge_request
,
@project
)
=
link_to
new_project_merge_request_path
(
@project
),
title:
"New Merge Request"
,
class:
"btn grouped"
do
=
link_to
new_project_merge_request_path
(
@project
),
title:
"New Merge Request"
,
class:
"btn
-small btn
grouped"
do
Merge Request
Merge Request
-
if
@project
.
issues_enabled
&&
can?
(
current_user
,
:write_issue
,
@project
)
-
if
@project
.
issues_enabled
&&
can?
(
current_user
,
:write_issue
,
@project
)
=
link_to
new_project_issue_path
(
@project
),
title:
"New Issue"
,
class:
"btn grouped"
do
=
link_to
new_project_issue_path
(
@project
),
title:
"New Issue"
,
class:
"btn
-small btn
grouped"
do
Issue
Issue
app/views/snippets/_form.html.haml
View file @
f614ae8e
%h3
=
@snippet
.
new_record?
?
"New Snippet"
:
"Edit Snippet #
#{
@snippet
.
id
}
"
%h3
.page_title
=
@snippet
.
new_record?
?
"New Snippet"
:
"Edit Snippet #
#{
@snippet
.
id
}
"
%hr
%hr
=
form_for
[
@project
,
@snippet
]
do
|
f
|
=
form_for
[
@project
,
@snippet
]
do
|
f
|
%table
.no-borders
-
if
@snippet
.
errors
.
any?
-
if
@snippet
.
errors
.
any?
.alert-message.block-message.error
.alert-message.block-message.error
%ul
%ul
-
@snippet
.
errors
.
full_messages
.
each
do
|
msg
|
-
@snippet
.
errors
.
full_messages
.
each
do
|
msg
|
%li
=
msg
%li
=
msg
.clearfix
.clearfix
=
f
.
label
:title
=
f
.
label
:title
.input
=
f
.
text_field
:title
,
placeholder:
"Example Snippet"
.input
=
f
.
text_field
:title
,
placeholder:
"Example Snippet"
.clearfix
.clearfix
=
f
.
label
:file_name
=
f
.
label
:file_name
.input
=
f
.
text_field
:file_name
,
placeholder:
"example.rb"
.input
=
f
.
text_field
:file_name
,
placeholder:
"example.rb"
.clearfix
.clearfix
=
f
.
label
"Lifetime"
=
f
.
label
"Lifetime"
.input
=
f
.
select
:expires_at
,
lifetime_select_options
,
{},
{
class:
'chosen span2'
}
.input
=
f
.
select
:expires_at
,
lifetime_select_options
,
{},
{
class:
'chosen span2'
}
.clearfix
.clearfix
=
f
.
label
:content
,
"Code"
=
f
.
label
:content
,
"Code"
.input
=
f
.
text_area
:content
,
class:
"span8"
.input
=
f
.
text_area
:content
,
class:
"span8"
.actions
.
form-
actions
=
f
.
submit
'Save'
,
class:
"primary btn"
=
f
.
submit
'Save'
,
class:
"primary btn"
=
link_to
"Cancel"
,
project_snippets_path
(
@project
),
class:
" btn"
=
link_to
"Cancel"
,
project_snippets_path
(
@project
),
class:
" btn"
-
unless
@snippet
.
new_record?
-
unless
@snippet
.
new_record?
...
...
features/support/env.rb
View file @
f614ae8e
...
@@ -5,7 +5,7 @@ require 'rspec'
...
@@ -5,7 +5,7 @@ require 'rspec'
require
'database_cleaner'
require
'database_cleaner'
require
'spinach/capybara'
require
'spinach/capybara'
%w(
namespaces_stub
gitolite_stub stubbed_repository valid_commit)
.
each
do
|
f
|
%w(gitolite_stub stubbed_repository valid_commit)
.
each
do
|
f
|
require
Rails
.
root
.
join
(
'spec'
,
'support'
,
f
)
require
Rails
.
root
.
join
(
'spec'
,
'support'
,
f
)
end
end
...
@@ -32,6 +32,11 @@ end
...
@@ -32,6 +32,11 @@ end
DatabaseCleaner
.
strategy
=
:truncation
DatabaseCleaner
.
strategy
=
:truncation
Spinach
.
hooks
.
before_scenario
do
Spinach
.
hooks
.
before_scenario
do
# Use tmp dir for FS manipulations
Gitlab
.
config
.
stub
(
git_base_path:
Rails
.
root
.
join
(
'tmp'
,
'test-git-base-path'
))
FileUtils
.
rm_rf
Gitlab
.
config
.
git_base_path
FileUtils
.
mkdir_p
Gitlab
.
config
.
git_base_path
DatabaseCleaner
.
start
DatabaseCleaner
.
start
end
end
...
...
spec/models/group_spec.rb
View file @
f614ae8e
...
@@ -22,4 +22,12 @@ describe Group do
...
@@ -22,4 +22,12 @@ describe Group do
it
{
should
validate_presence_of
:path
}
it
{
should
validate_presence_of
:path
}
it
{
should
validate_uniqueness_of
(
:path
)
}
it
{
should
validate_uniqueness_of
(
:path
)
}
it
{
should
validate_presence_of
:owner
}
it
{
should
validate_presence_of
:owner
}
describe
:users
do
it
{
group
.
users
.
should
==
[]
}
end
describe
:human_name
do
it
{
group
.
human_name
.
should
==
group
.
name
}
end
end
end
spec/models/namespace_spec.rb
View file @
f614ae8e
...
@@ -32,4 +32,46 @@ describe Namespace do
...
@@ -32,4 +32,46 @@ describe Namespace do
it
{
should
respond_to
(
:human_name
)
}
it
{
should
respond_to
(
:human_name
)
}
it
{
should
respond_to
(
:to_param
)
}
it
{
should
respond_to
(
:to_param
)
}
end
end
it
{
Namespace
.
global_id
.
should
==
'GLN'
}
describe
:to_param
do
it
{
namespace
.
to_param
.
should
==
namespace
.
path
}
end
describe
:human_name
do
it
{
namespace
.
human_name
.
should
==
namespace
.
owner_name
}
end
describe
:search
do
before
do
@namespace
=
create
:namespace
end
it
{
Namespace
.
search
(
@namespace
.
path
).
should
==
[
@namespace
]
}
it
{
Namespace
.
search
(
'unknown'
).
should
==
[]
}
end
describe
:move_dir
do
before
do
@namespace
=
create
:namespace
end
it
"should raise error when called directly"
do
expect
{
@namespace
.
move_dir
}.
to
raise_error
(
"Already exists"
)
end
it
"should move dir if path changed"
do
new_path
=
@namespace
.
path
+
"_new"
@namespace
.
stub
(
path_was:
@namespace
.
path
)
@namespace
.
stub
(
path:
new_path
)
@namespace
.
move_dir
.
should
be_true
end
end
describe
:rm_dir
do
it
"should remove dir"
do
namespace
.
rm_dir
.
should
be_true
end
end
end
end
spec/spec_helper.rb
View file @
f614ae8e
...
@@ -40,5 +40,10 @@ RSpec.configure do |config|
...
@@ -40,5 +40,10 @@ RSpec.configure do |config|
# !!! Observers disabled by default in tests
# !!! Observers disabled by default in tests
ActiveRecord
::
Base
.
observers
.
disable
(
:all
)
ActiveRecord
::
Base
.
observers
.
disable
(
:all
)
# ActiveRecord::Base.observers.enable(:all)
# ActiveRecord::Base.observers.enable(:all)
# Use tmp dir for FS manipulations
Gitlab
.
config
.
stub
(
git_base_path:
Rails
.
root
.
join
(
'tmp'
,
'test-git-base-path'
))
FileUtils
.
rm_rf
Gitlab
.
config
.
git_base_path
FileUtils
.
mkdir_p
Gitlab
.
config
.
git_base_path
end
end
end
end
spec/support/namespaces_stub.rb
deleted
100644 → 0
View file @
e9be4b37
require
'namespace'
require
'gitlab/project_mover'
class
Namespace
def
ensure_dir_exist
true
end
def
move_dir
true
end
end
#class Gitlab::ProjectMover
#def execute
#true
#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