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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
12d44272
Commit
12d44272
authored
May 30, 2016
by
Grzegorz Bizon
Committed by
James Edwards-Jones
Feb 01, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix Rubocop offenses
parent
66bfc9e9
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
15 deletions
+15
-15
spec/models/pages_domain_spec.rb
spec/models/pages_domain_spec.rb
+7
-7
spec/services/pages_service_spec.rb
spec/services/pages_service_spec.rb
+2
-2
spec/services/projects/update_pages_service_spec.rb
spec/services/projects/update_pages_service_spec.rb
+6
-6
No files found.
spec/models/pages_domain_spec.rb
View file @
12d44272
...
...
@@ -23,13 +23,13 @@ describe PagesDomain, models: true do
context
'no domain'
do
let
(
:domain
)
{
nil
}
it
{
is_expected
.
to_not
be_valid
}
it
{
is_expected
.
not_to
be_valid
}
end
context
'invalid domain'
do
let
(
:domain
)
{
'0123123'
}
it
{
is_expected
.
to_not
be_valid
}
it
{
is_expected
.
not_to
be_valid
}
end
context
'domain from .example.com'
do
...
...
@@ -37,7 +37,7 @@ describe PagesDomain, models: true do
before
{
allow
(
Settings
.
pages
).
to
receive
(
:host
).
and_return
(
'domain.com'
)
}
it
{
is_expected
.
to_not
be_valid
}
it
{
is_expected
.
not_to
be_valid
}
end
end
...
...
@@ -47,13 +47,13 @@ describe PagesDomain, models: true do
context
'when only certificate is specified'
do
let
(
:domain
)
{
build
(
:pages_domain
,
:with_certificate
)
}
it
{
is_expected
.
to_not
be_valid
}
it
{
is_expected
.
not_to
be_valid
}
end
context
'when only key is specified'
do
let
(
:domain
)
{
build
(
:pages_domain
,
:with_key
)
}
it
{
is_expected
.
to_not
be_valid
}
it
{
is_expected
.
not_to
be_valid
}
end
context
'with matching key'
do
...
...
@@ -65,7 +65,7 @@ describe PagesDomain, models: true do
context
'for not matching key'
do
let
(
:domain
)
{
build
(
:pages_domain
,
:with_missing_chain
,
:with_key
)
}
it
{
is_expected
.
to_not
be_valid
}
it
{
is_expected
.
not_to
be_valid
}
end
end
...
...
@@ -157,6 +157,6 @@ describe PagesDomain, models: true do
subject
{
domain
.
certificate_text
}
# We test only existence of output, since the output is long
it
{
is_expected
.
to_not
be_empty
}
it
{
is_expected
.
not_to
be_empty
}
end
end
spec/services/pages_service_spec.rb
View file @
12d44272
...
...
@@ -26,7 +26,7 @@ describe PagesService, services: true do
before
{
build
.
status
=
status
}
it
'should not execute worker'
do
expect
(
PagesWorker
).
to_not
receive
(
:perform_async
)
expect
(
PagesWorker
).
not_to
receive
(
:perform_async
)
service
.
execute
end
end
...
...
@@ -40,7 +40,7 @@ describe PagesService, services: true do
end
it
'should not execute worker'
do
expect
(
PagesWorker
).
to_not
receive
(
:perform_async
)
expect
(
PagesWorker
).
not_to
receive
(
:perform_async
)
service
.
execute
end
end
...
...
spec/services/projects/update_pages_service_spec.rb
View file @
12d44272
...
...
@@ -34,7 +34,7 @@ describe Projects::UpdatePagesService do
it
'limits pages size'
do
stub_application_setting
(
max_pages_size:
1
)
expect
(
execute
).
to_not
eq
(
:success
)
expect
(
execute
).
not_to
eq
(
:success
)
end
it
'removes pages after destroy'
do
...
...
@@ -49,29 +49,29 @@ describe Projects::UpdatePagesService do
it
'fails if sha on branch is not latest'
do
pipeline
.
update_attributes
(
sha:
'old_sha'
)
build
.
update_attributes
(
artifacts_file:
file
)
expect
(
execute
).
to_not
eq
(
:success
)
expect
(
execute
).
not_to
eq
(
:success
)
end
it
'fails for empty file fails'
do
build
.
update_attributes
(
artifacts_file:
empty_file
)
expect
(
execute
).
to_not
eq
(
:success
)
expect
(
execute
).
not_to
eq
(
:success
)
end
end
end
it
'fails to remove project pages when no pages is deployed'
do
expect
(
PagesWorker
).
to_not
receive
(
:perform_in
)
expect
(
PagesWorker
).
not_to
receive
(
:perform_in
)
expect
(
project
.
pages_deployed?
).
to
be_falsey
project
.
destroy
end
it
'fails if no artifacts'
do
expect
(
execute
).
to_not
eq
(
:success
)
expect
(
execute
).
not_to
eq
(
:success
)
end
it
'fails for invalid archive'
do
build
.
update_attributes
(
artifacts_file:
invalid_file
)
expect
(
execute
).
to_not
eq
(
:success
)
expect
(
execute
).
not_to
eq
(
:success
)
end
def
execute
...
...
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