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
392cfc4ff7a4
Commit
cddc5cac
authored
Jul 25, 2017
by
Rémy Coutable
Browse files
Use described_class when possible
Signed-off-by:
Rémy Coutable
<
remy@rymai.me
>
parent
2df28948ac44
Changes
106
Hide whitespace changes
Inline
Side-by-side
spec/initializers/settings_spec.rb
View file @
392cfc4f
...
...
@@ -5,37 +5,37 @@
describe
'#host_without_www'
do
context
'URL with protocol'
do
it
'returns the host'
do
expect
(
Setting
s
.
host_without_www
(
'http://foo.com'
)).
to
eq
'foo.com'
expect
(
Setting
s
.
host_without_www
(
'http://www.foo.com'
)).
to
eq
'foo.com'
expect
(
Setting
s
.
host_without_www
(
'http://secure.foo.com'
)).
to
eq
'secure.foo.com'
expect
(
Setting
s
.
host_without_www
(
'http://www.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon'
)).
to
eq
'gravatar.com'
expect
(
described_clas
s
.
host_without_www
(
'http://foo.com'
)).
to
eq
'foo.com'
expect
(
described_clas
s
.
host_without_www
(
'http://www.foo.com'
)).
to
eq
'foo.com'
expect
(
described_clas
s
.
host_without_www
(
'http://secure.foo.com'
)).
to
eq
'secure.foo.com'
expect
(
described_clas
s
.
host_without_www
(
'http://www.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon'
)).
to
eq
'gravatar.com'
expect
(
Setting
s
.
host_without_www
(
'https://foo.com'
)).
to
eq
'foo.com'
expect
(
Setting
s
.
host_without_www
(
'https://www.foo.com'
)).
to
eq
'foo.com'
expect
(
Setting
s
.
host_without_www
(
'https://secure.foo.com'
)).
to
eq
'secure.foo.com'
expect
(
Setting
s
.
host_without_www
(
'https://secure.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon'
)).
to
eq
'secure.gravatar.com'
expect
(
described_clas
s
.
host_without_www
(
'https://foo.com'
)).
to
eq
'foo.com'
expect
(
described_clas
s
.
host_without_www
(
'https://www.foo.com'
)).
to
eq
'foo.com'
expect
(
described_clas
s
.
host_without_www
(
'https://secure.foo.com'
)).
to
eq
'secure.foo.com'
expect
(
described_clas
s
.
host_without_www
(
'https://secure.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon'
)).
to
eq
'secure.gravatar.com'
end
end
context
'URL without protocol'
do
it
'returns the host'
do
expect
(
Setting
s
.
host_without_www
(
'foo.com'
)).
to
eq
'foo.com'
expect
(
Setting
s
.
host_without_www
(
'www.foo.com'
)).
to
eq
'foo.com'
expect
(
Setting
s
.
host_without_www
(
'secure.foo.com'
)).
to
eq
'secure.foo.com'
expect
(
Setting
s
.
host_without_www
(
'www.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon'
)).
to
eq
'gravatar.com'
expect
(
described_clas
s
.
host_without_www
(
'foo.com'
)).
to
eq
'foo.com'
expect
(
described_clas
s
.
host_without_www
(
'www.foo.com'
)).
to
eq
'foo.com'
expect
(
described_clas
s
.
host_without_www
(
'secure.foo.com'
)).
to
eq
'secure.foo.com'
expect
(
described_clas
s
.
host_without_www
(
'www.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon'
)).
to
eq
'gravatar.com'
end
context
'URL with user/port'
do
it
'returns the host'
do
expect
(
Setting
s
.
host_without_www
(
'bob:pass@foo.com:8080'
)).
to
eq
'foo.com'
expect
(
Setting
s
.
host_without_www
(
'bob:pass@www.foo.com:8080'
)).
to
eq
'foo.com'
expect
(
Setting
s
.
host_without_www
(
'bob:pass@secure.foo.com:8080'
)).
to
eq
'secure.foo.com'
expect
(
Setting
s
.
host_without_www
(
'bob:pass@www.gravatar.com:8080/avatar/%{hash}?s=%{size}&d=identicon'
)).
to
eq
'gravatar.com'
expect
(
described_clas
s
.
host_without_www
(
'bob:pass@foo.com:8080'
)).
to
eq
'foo.com'
expect
(
described_clas
s
.
host_without_www
(
'bob:pass@www.foo.com:8080'
)).
to
eq
'foo.com'
expect
(
described_clas
s
.
host_without_www
(
'bob:pass@secure.foo.com:8080'
)).
to
eq
'secure.foo.com'
expect
(
described_clas
s
.
host_without_www
(
'bob:pass@www.gravatar.com:8080/avatar/%{hash}?s=%{size}&d=identicon'
)).
to
eq
'gravatar.com'
expect
(
Setting
s
.
host_without_www
(
'http://bob:pass@foo.com:8080'
)).
to
eq
'foo.com'
expect
(
Setting
s
.
host_without_www
(
'http://bob:pass@www.foo.com:8080'
)).
to
eq
'foo.com'
expect
(
Setting
s
.
host_without_www
(
'http://bob:pass@secure.foo.com:8080'
)).
to
eq
'secure.foo.com'
expect
(
Setting
s
.
host_without_www
(
'http://bob:pass@www.gravatar.com:8080/avatar/%{hash}?s=%{size}&d=identicon'
)).
to
eq
'gravatar.com'
expect
(
described_clas
s
.
host_without_www
(
'http://bob:pass@foo.com:8080'
)).
to
eq
'foo.com'
expect
(
described_clas
s
.
host_without_www
(
'http://bob:pass@www.foo.com:8080'
)).
to
eq
'foo.com'
expect
(
described_clas
s
.
host_without_www
(
'http://bob:pass@secure.foo.com:8080'
)).
to
eq
'secure.foo.com'
expect
(
described_clas
s
.
host_without_www
(
'http://bob:pass@www.gravatar.com:8080/avatar/%{hash}?s=%{size}&d=identicon'
)).
to
eq
'gravatar.com'
end
end
end
...
...
spec/lib/disable_email_interceptor_spec.rb
View file @
392cfc4f
...
...
@@ -2,7 +2,7 @@
describe
DisableEmailInterceptor
do
before
do
Mail
.
register_interceptor
(
DisableEmailInterceptor
)
Mail
.
register_interceptor
(
described_class
)
end
it
'does not send emails'
do
...
...
@@ -14,7 +14,7 @@
# Removing interceptor from the list because unregister_interceptor is
# implemented in later version of mail gem
# See: https://github.com/mikel/mail/pull/705
Mail
.
unregister_interceptor
(
DisableEmailInterceptor
)
Mail
.
unregister_interceptor
(
described_class
)
end
def
deliver_mail
...
...
spec/lib/event_filter_spec.rb
View file @
392cfc4f
...
...
@@ -16,42 +16,42 @@
let!
(
:left_event
)
{
create
(
:event
,
:left
,
project:
public_project
,
target:
public_project
,
author:
source_user
)
}
it
'applies push filter'
do
events
=
EventFilter
.
new
(
EventFilter
.
push
).
apply_filter
(
Event
.
all
)
events
=
described_class
.
new
(
described_class
.
push
).
apply_filter
(
Event
.
all
)
expect
(
events
).
to
contain_exactly
(
push_event
)
end
it
'applies merged filter'
do
events
=
EventFilter
.
new
(
EventFilter
.
merged
).
apply_filter
(
Event
.
all
)
events
=
described_class
.
new
(
described_class
.
merged
).
apply_filter
(
Event
.
all
)
expect
(
events
).
to
contain_exactly
(
merged_event
)
end
it
'applies issue filter'
do
events
=
EventFilter
.
new
(
EventFilter
.
issue
).
apply_filter
(
Event
.
all
)
events
=
described_class
.
new
(
described_class
.
issue
).
apply_filter
(
Event
.
all
)
expect
(
events
).
to
contain_exactly
(
created_event
,
updated_event
,
closed_event
,
reopened_event
)
end
it
'applies comments filter'
do
events
=
EventFilter
.
new
(
EventFilter
.
comments
).
apply_filter
(
Event
.
all
)
events
=
described_class
.
new
(
described_class
.
comments
).
apply_filter
(
Event
.
all
)
expect
(
events
).
to
contain_exactly
(
comments_event
)
end
it
'applies team filter'
do
events
=
EventFilter
.
new
(
EventFilter
.
team
).
apply_filter
(
Event
.
all
)
events
=
described_class
.
new
(
described_class
.
team
).
apply_filter
(
Event
.
all
)
expect
(
events
).
to
contain_exactly
(
joined_event
,
left_event
)
end
it
'applies all filter'
do
events
=
EventFilter
.
new
(
EventFilter
.
all
).
apply_filter
(
Event
.
all
)
events
=
described_class
.
new
(
described_class
.
all
).
apply_filter
(
Event
.
all
)
expect
(
events
).
to
contain_exactly
(
push_event
,
merged_event
,
created_event
,
updated_event
,
closed_event
,
reopened_event
,
comments_event
,
joined_event
,
left_event
)
end
it
'applies no filter'
do
events
=
EventFilter
.
new
(
nil
).
apply_filter
(
Event
.
all
)
events
=
described_class
.
new
(
nil
).
apply_filter
(
Event
.
all
)
expect
(
events
).
to
contain_exactly
(
push_event
,
merged_event
,
created_event
,
updated_event
,
closed_event
,
reopened_event
,
comments_event
,
joined_event
,
left_event
)
end
it
'applies unknown filter'
do
events
=
EventFilter
.
new
(
''
).
apply_filter
(
Event
.
all
)
events
=
described_class
.
new
(
''
).
apply_filter
(
Event
.
all
)
expect
(
events
).
to
contain_exactly
(
push_event
,
merged_event
,
created_event
,
updated_event
,
closed_event
,
reopened_event
,
comments_event
,
joined_event
,
left_event
)
end
end
...
...
spec/lib/extracts_path_spec.rb
View file @
392cfc4f
require
'spec_helper'
describe
ExtractsPath
do
include
ExtractsPath
include
described_class
include
RepoHelpers
include
Gitlab
::
Routing
...
...
spec/lib/file_size_validator_spec.rb
View file @
392cfc4f
require
'spec_helper'
describe
FileSizeValidator
do
let
(
:validator
)
{
FileSizeValidator
.
new
(
options
)
}
let
(
:validator
)
{
described_class
.
new
(
options
)
}
let
(
:attachment
)
{
AttachmentUploader
.
new
}
let
(
:note
)
{
create
(
:note
)
}
...
...
spec/lib/gitlab/bitbucket_import/importer_spec.rb
View file @
392cfc4f
...
...
@@ -58,7 +58,7 @@
)
end
let
(
:importer
)
{
Gitlab
::
BitbucketImport
::
Importer
.
new
(
project
)
}
let
(
:importer
)
{
described_class
.
new
(
project
)
}
let
(
:issues_statuses_sample_data
)
do
{
...
...
spec/lib/gitlab/bitbucket_import/project_creator_spec.rb
View file @
392cfc4f
...
...
@@ -27,7 +27,7 @@
it
'creates project'
do
allow_any_instance_of
(
Project
).
to
receive
(
:add_import_job
)
project_creator
=
Gitlab
::
BitbucketImport
::
ProjectCreator
.
new
(
repo
,
'vim'
,
namespace
,
user
,
access_params
)
project_creator
=
described_class
.
new
(
repo
,
'vim'
,
namespace
,
user
,
access_params
)
project
=
project_creator
.
execute
expect
(
project
.
import_url
).
to
eq
(
"ssh://git@bitbucket.org/asd/vim.git"
)
...
...
spec/lib/gitlab/ci_access_spec.rb
View file @
392cfc4f
require
'spec_helper'
describe
Gitlab
::
CiAccess
do
let
(
:access
)
{
Gitlab
::
CiAcce
ss
.
new
}
let
(
:access
)
{
described_cla
ss
.
new
}
describe
'#can_do_action?'
do
context
'when action is :build_download_code'
do
...
...
spec/lib/gitlab/conflict/file_spec.rb
View file @
392cfc4f
...
...
@@ -10,7 +10,7 @@
let
(
:index
)
{
rugged
.
merge_commits
(
our_commit
,
their_commit
)
}
let
(
:conflict
)
{
index
.
conflicts
.
last
}
let
(
:merge_file_result
)
{
index
.
merge_file
(
'files/ruby/regex.rb'
)
}
let
(
:conflict_file
)
{
Gitlab
::
Conflict
::
File
.
new
(
merge_file_result
,
conflict
,
merge_request:
merge_request
)
}
let
(
:conflict_file
)
{
described_class
.
new
(
merge_file_result
,
conflict
,
merge_request:
merge_request
)
}
describe
'#resolve_lines'
do
let
(
:section_keys
)
{
conflict_file
.
sections
.
map
{
|
section
|
section
[
:id
]
}.
compact
}
...
...
@@ -220,7 +220,7 @@ def default_regex
FILE
end
let
(
:conflict_file
)
{
Gitlab
::
Conflict
::
File
.
new
({
data:
file
},
conflict
,
merge_request:
merge_request
)
}
let
(
:conflict_file
)
{
described_class
.
new
({
data:
file
},
conflict
,
merge_request:
merge_request
)
}
let
(
:sections
)
{
conflict_file
.
sections
}
it
'sets the correct match line headers'
do
...
...
spec/lib/gitlab/conflict/parser_spec.rb
View file @
392cfc4f
require
'spec_helper'
describe
Gitlab
::
Conflict
::
Parser
do
let
(
:parser
)
{
Gitlab
::
Conflict
::
Parser
.
new
}
let
(
:parser
)
{
described_class
.
new
}
describe
'#parse'
do
def
parse_text
(
text
)
...
...
spec/lib/gitlab/database/migration_helpers_spec.rb
View file @
392cfc4f
...
...
@@ -3,7 +3,7 @@
describe
Gitlab
::
Database
::
MigrationHelpers
do
let
(
:model
)
do
ActiveRecord
::
Migration
.
new
.
extend
(
Gitlab
::
Database
::
MigrationHelper
s
described_clas
s
)
end
...
...
spec/lib/gitlab/diff/highlight_spec.rb
View file @
392cfc4f
...
...
@@ -10,7 +10,7 @@
describe
'#highlight'
do
context
"with a diff file"
do
let
(
:subject
)
{
Gitlab
::
Diff
::
Highlight
.
new
(
diff_file
,
repository:
project
.
repository
).
highlight
}
let
(
:subject
)
{
described_class
.
new
(
diff_file
,
repository:
project
.
repository
).
highlight
}
it
'returns Gitlab::Diff::Line elements'
do
expect
(
subject
.
first
).
to
be_an_instance_of
(
Gitlab
::
Diff
::
Line
)
...
...
@@ -41,7 +41,7 @@
end
context
"with diff lines"
do
let
(
:subject
)
{
Gitlab
::
Diff
::
Highlight
.
new
(
diff_file
.
diff_lines
,
repository:
project
.
repository
).
highlight
}
let
(
:subject
)
{
described_class
.
new
(
diff_file
.
diff_lines
,
repository:
project
.
repository
).
highlight
}
it
'returns Gitlab::Diff::Line elements'
do
expect
(
subject
.
first
).
to
be_an_instance_of
(
Gitlab
::
Diff
::
Line
)
...
...
spec/lib/gitlab/diff/parser_spec.rb
View file @
392cfc4f
...
...
@@ -6,7 +6,7 @@
let
(
:project
)
{
create
(
:project
)
}
let
(
:commit
)
{
project
.
commit
(
sample_commit
.
id
)
}
let
(
:diff
)
{
commit
.
raw_diffs
.
first
}
let
(
:parser
)
{
Gitlab
::
Diff
::
Parser
.
new
}
let
(
:parser
)
{
described_class
.
new
}
describe
'#parse'
do
let
(
:diff
)
do
...
...
spec/lib/gitlab/git/hook_spec.rb
View file @
392cfc4f
...
...
@@ -5,7 +5,7 @@
before
do
# We need this because in the spec/spec_helper.rb we define it like this:
# allow_any_instance_of(Gitlab::Git::Hook).to receive(:trigger).and_return([true, nil])
allow_any_instance_of
(
Gitlab
::
Git
::
Hook
).
to
receive
(
:trigger
).
and_call_original
allow_any_instance_of
(
described_class
).
to
receive
(
:trigger
).
and_call_original
end
describe
"#trigger"
do
...
...
@@ -48,7 +48,7 @@ def create_failing_hook(name)
it
"returns success with no errors"
do
create_hook
(
hook_name
)
hook
=
Gitlab
::
Git
::
Hook
.
new
(
hook_name
,
project
)
hook
=
described_class
.
new
(
hook_name
,
project
)
blank
=
Gitlab
::
Git
::
BLANK_SHA
ref
=
Gitlab
::
Git
::
BRANCH_REF_PREFIX
+
'new_branch'
...
...
@@ -66,7 +66,7 @@ def create_failing_hook(name)
context
"when the hook is unsuccessful"
do
it
"returns failure with errors"
do
create_failing_hook
(
hook_name
)
hook
=
Gitlab
::
Git
::
Hook
.
new
(
hook_name
,
project
)
hook
=
described_class
.
new
(
hook_name
,
project
)
blank
=
Gitlab
::
Git
::
BLANK_SHA
ref
=
Gitlab
::
Git
::
BRANCH_REF_PREFIX
+
'new_branch'
...
...
@@ -80,7 +80,7 @@ def create_failing_hook(name)
context
"when the hook doesn't exist"
do
it
"returns success with no errors"
do
hook
=
Gitlab
::
Git
::
Hook
.
new
(
'unknown_hook'
,
project
)
hook
=
described_class
.
new
(
'unknown_hook'
,
project
)
blank
=
Gitlab
::
Git
::
BLANK_SHA
ref
=
Gitlab
::
Git
::
BRANCH_REF_PREFIX
+
'new_branch'
...
...
spec/lib/gitlab/git/rev_list_spec.rb
View file @
392cfc4f
...
...
@@ -11,7 +11,7 @@
end
context
"#new_refs"
do
let
(
:rev_list
)
{
Gitlab
::
Git
::
RevList
.
new
(
newrev:
'newrev'
,
path_to_repo:
project
.
repository
.
path_to_repo
)
}
let
(
:rev_list
)
{
described_class
.
new
(
newrev:
'newrev'
,
path_to_repo:
project
.
repository
.
path_to_repo
)
}
it
'calls out to `popen`'
do
expect
(
Gitlab
::
Popen
).
to
receive
(
:popen
).
with
([
...
...
@@ -33,7 +33,7 @@
end
context
"#missed_ref"
do
let
(
:rev_list
)
{
Gitlab
::
Git
::
RevList
.
new
(
oldrev:
'oldrev'
,
newrev:
'newrev'
,
path_to_repo:
project
.
repository
.
path_to_repo
)
}
let
(
:rev_list
)
{
described_class
.
new
(
oldrev:
'oldrev'
,
newrev:
'newrev'
,
path_to_repo:
project
.
repository
.
path_to_repo
)
}
it
'calls out to `popen`'
do
expect
(
Gitlab
::
Popen
).
to
receive
(
:popen
).
with
([
...
...
spec/lib/gitlab/git_access_spec.rb
View file @
392cfc4f
...
...
@@ -3,7 +3,7 @@
describe
Gitlab
::
GitAccess
do
let
(
:pull_access_check
)
{
access
.
check
(
'git-upload-pack'
,
'_any'
)
}
let
(
:push_access_check
)
{
access
.
check
(
'git-receive-pack'
,
'_any'
)
}
let
(
:access
)
{
Gitlab
::
GitAcce
ss
.
new
(
actor
,
project
,
protocol
,
authentication_abilities:
authentication_abilities
,
redirected_path:
redirected_path
)
}
let
(
:access
)
{
described_cla
ss
.
new
(
actor
,
project
,
protocol
,
authentication_abilities:
authentication_abilities
,
redirected_path:
redirected_path
)
}
let
(
:project
)
{
create
(
:project
,
:repository
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:actor
)
{
user
}
...
...
@@ -280,7 +280,7 @@ def disable_protocol(protocol)
context
'when project is public'
do
let
(
:public_project
)
{
create
(
:project
,
:public
,
:repository
)
}
let
(
:access
)
{
Gitlab
::
GitAcce
ss
.
new
(
nil
,
public_project
,
'web'
,
authentication_abilities:
[])
}
let
(
:access
)
{
described_cla
ss
.
new
(
nil
,
public_project
,
'web'
,
authentication_abilities:
[])
}
context
'when repository is enabled'
do
it
'give access to download code'
do
...
...
@@ -441,7 +441,7 @@ def self.run_permission_checks(permissions_matrix)
end
permissions_matrix
[
role
].
each
do
|
action
,
allowed
|
context
action
do
context
action
.
to_s
do
subject
{
access
.
send
(
:check_push_access!
,
changes
[
action
])
}
it
do
...
...
spec/lib/gitlab/git_access_wiki_spec.rb
View file @
392cfc4f
require
'spec_helper'
describe
Gitlab
::
GitAccessWiki
do
let
(
:access
)
{
Gitlab
::
GitAccessWiki
.
new
(
user
,
project
,
'web'
,
authentication_abilities:
authentication_abilities
,
redirected_path:
redirected_path
)
}
let
(
:access
)
{
described_class
.
new
(
user
,
project
,
'web'
,
authentication_abilities:
authentication_abilities
,
redirected_path:
redirected_path
)
}
let
(
:project
)
{
create
(
:project
,
:repository
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:redirected_path
)
{
nil
}
...
...
spec/lib/gitlab/git_ref_validator_spec.rb
View file @
392cfc4f
require
'spec_helper'
describe
Gitlab
::
GitRefValidator
do
it
{
expect
(
Gitlab
::
GitRefValidator
.
validate
(
'feature/new'
)).
to
be_truthy
}
it
{
expect
(
Gitlab
::
GitRefValidator
.
validate
(
'implement_@all'
)).
to
be_truthy
}
it
{
expect
(
Gitlab
::
GitRefValidator
.
validate
(
'my_new_feature'
)).
to
be_truthy
}
it
{
expect
(
Gitlab
::
GitRefValidator
.
validate
(
'#1'
)).
to
be_truthy
}
it
{
expect
(
Gitlab
::
GitRefValidator
.
validate
(
'feature/refs/heads/foo'
)).
to
be_truthy
}
it
{
expect
(
Gitlab
::
GitRefValidator
.
validate
(
'feature/~new/'
)).
to
be_falsey
}
it
{
expect
(
Gitlab
::
GitRefValidator
.
validate
(
'feature/^new/'
)).
to
be_falsey
}
it
{
expect
(
Gitlab
::
GitRefValidator
.
validate
(
'feature/:new/'
)).
to
be_falsey
}
it
{
expect
(
Gitlab
::
GitRefValidator
.
validate
(
'feature/?new/'
)).
to
be_falsey
}
it
{
expect
(
Gitlab
::
GitRefValidator
.
validate
(
'feature/*new/'
)).
to
be_falsey
}
it
{
expect
(
Gitlab
::
GitRefValidator
.
validate
(
'feature/[new/'
)).
to
be_falsey
}
it
{
expect
(
Gitlab
::
GitRefValidator
.
validate
(
'feature/new/'
)).
to
be_falsey
}
it
{
expect
(
Gitlab
::
GitRefValidator
.
validate
(
'feature/new.'
)).
to
be_falsey
}
it
{
expect
(
Gitlab
::
GitRefValidator
.
validate
(
'feature\@{'
)).
to
be_falsey
}
it
{
expect
(
Gitlab
::
GitRefValidator
.
validate
(
'feature\new'
)).
to
be_falsey
}
it
{
expect
(
Gitlab
::
GitRefValidator
.
validate
(
'feature//new'
)).
to
be_falsey
}
it
{
expect
(
Gitlab
::
GitRefValidator
.
validate
(
'feature new'
)).
to
be_falsey
}
it
{
expect
(
Gitlab
::
GitRefValidator
.
validate
(
'refs/heads/'
)).
to
be_falsey
}
it
{
expect
(
Gitlab
::
GitRefValidator
.
validate
(
'refs/remotes/'
)).
to
be_falsey
}
it
{
expect
(
Gitlab
::
GitRefValidator
.
validate
(
'refs/heads/feature'
)).
to
be_falsey
}
it
{
expect
(
Gitlab
::
GitRefValidator
.
validate
(
'refs/remotes/origin'
)).
to
be_falsey
}
it
{
expect
(
described_class
.
validate
(
'feature/new'
)).
to
be_truthy
}
it
{
expect
(
described_class
.
validate
(
'implement_@all'
)).
to
be_truthy
}
it
{
expect
(
described_class
.
validate
(
'my_new_feature'
)).
to
be_truthy
}
it
{
expect
(
described_class
.
validate
(
'#1'
)).
to
be_truthy
}
it
{
expect
(
described_class
.
validate
(
'feature/refs/heads/foo'
)).
to
be_truthy
}
it
{
expect
(
described_class
.
validate
(
'feature/~new/'
)).
to
be_falsey
}
it
{
expect
(
described_class
.
validate
(
'feature/^new/'
)).
to
be_falsey
}
it
{
expect
(
described_class
.
validate
(
'feature/:new/'
)).
to
be_falsey
}
it
{
expect
(
described_class
.
validate
(
'feature/?new/'
)).
to
be_falsey
}
it
{
expect
(
described_class
.
validate
(
'feature/*new/'
)).
to
be_falsey
}
it
{
expect
(
described_class
.
validate
(
'feature/[new/'
)).
to
be_falsey
}
it
{
expect
(
described_class
.
validate
(
'feature/new/'
)).
to
be_falsey
}
it
{
expect
(
described_class
.
validate
(
'feature/new.'
)).
to
be_falsey
}
it
{
expect
(
described_class
.
validate
(
'feature\@{'
)).
to
be_falsey
}
it
{
expect
(
described_class
.
validate
(
'feature\new'
)).
to
be_falsey
}
it
{
expect
(
described_class
.
validate
(
'feature//new'
)).
to
be_falsey
}
it
{
expect
(
described_class
.
validate
(
'feature new'
)).
to
be_falsey
}
it
{
expect
(
described_class
.
validate
(
'refs/heads/'
)).
to
be_falsey
}
it
{
expect
(
described_class
.
validate
(
'refs/remotes/'
)).
to
be_falsey
}
it
{
expect
(
described_class
.
validate
(
'refs/heads/feature'
)).
to
be_falsey
}
it
{
expect
(
described_class
.
validate
(
'refs/remotes/origin'
)).
to
be_falsey
}
end
spec/lib/gitlab/git_spec.rb
View file @
392cfc4f
...
...
@@ -6,7 +6,7 @@
describe
'committer_hash'
do
it
"returns a hash containing the given email and name"
do
committer_hash
=
Gitlab
::
Git
.
committer_hash
(
email:
committer_email
,
name:
committer_name
)
committer_hash
=
described_class
.
committer_hash
(
email:
committer_email
,
name:
committer_name
)
expect
(
committer_hash
[
:email
]).
to
eq
(
committer_email
)
expect
(
committer_hash
[
:name
]).
to
eq
(
committer_name
)
...
...
@@ -15,7 +15,7 @@
context
'when email is nil'
do
it
"returns nil"
do
committer_hash
=
Gitlab
::
Git
.
committer_hash
(
email:
nil
,
name:
committer_name
)
committer_hash
=
described_class
.
committer_hash
(
email:
nil
,
name:
committer_name
)
expect
(
committer_hash
).
to
be_nil
end
...
...
@@ -23,7 +23,7 @@
context
'when name is nil'
do
it
"returns nil"
do
committer_hash
=
Gitlab
::
Git
.
committer_hash
(
email:
committer_email
,
name:
nil
)
committer_hash
=
described_class
.
committer_hash
(
email:
committer_email
,
name:
nil
)
expect
(
committer_hash
).
to
be_nil
end
...
...
spec/lib/gitlab/gitlab_import/client_spec.rb
View file @
392cfc4f
...
...
@@ -4,7 +4,7 @@
include
ImportSpecHelper
let
(
:token
)
{
'123456'
}
let
(
:client
)
{
Gitlab
::
GitlabImport
::
Client
.
new
(
token
)
}
let
(
:client
)
{
described_class
.
new
(
token
)
}
before
do
stub_omniauth_provider
(
'gitlab'
)
...
...
Prev
1
2
3
4
5
6
Next
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