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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
c089f103
Commit
c089f103
authored
Feb 17, 2016
by
Kamil Trzcinski
Committed by
James Edwards-Jones
Jan 31, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update comments
parent
92a1efe6
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
5 deletions
+7
-5
features/steps/project/pages.rb
features/steps/project/pages.rb
+1
-1
spec/factories/pages_domains.rb
spec/factories/pages_domains.rb
+2
-4
spec/models/pages_domain_spec.rb
spec/models/pages_domain_spec.rb
+4
-0
No files found.
features/steps/project/pages.rb
View file @
c089f103
...
...
@@ -34,7 +34,7 @@ class Spinach::Features::ProjectPages < Spinach::FeatureSteps
ref:
'HEAD'
,
artifacts_file:
fixture_file_upload
(
Rails
.
root
+
'spec/fixtures/pages.zip'
),
artifacts_metadata:
fixture_file_upload
(
Rails
.
root
+
'spec/fixtures/pages.zip.meta'
)
)
)
result
=
::
Projects
::
UpdatePagesService
.
new
(
@project
,
build
).
execute
expect
(
result
[
:status
]).
to
eq
(
:success
)
end
...
...
spec/factories/pages_domains.rb
View file @
c089f103
...
...
@@ -63,11 +63,9 @@ VM+d42lQAgoq318A84Xu5vRh1KCAJuztkhNbM+w=
end
trait
:with_trusted_chain
do
# This
i
s
# This
contain
s
# [Intermediate #2 (SHA-2)] 'Comodo RSA Domain Validation Secure Server CA'
# [Intermediate #1 (SHA-2)] COMODO RSA Certification Authority
# We only validate that we want to rebuild the trust chain,
# we don't need end-to-end certificate to do that
# [Intermediate #1 (SHA-2)] 'COMODO RSA Certification Authority'
certificate
'-----BEGIN CERTIFICATE-----
MIIGCDCCA/CgAwIBAgIQKy5u6tl1NmwUim7bo3yMBzANBgkqhkiG9w0BAQwFADCB
hTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
...
...
spec/models/pages_domain_spec.rb
View file @
c089f103
...
...
@@ -117,6 +117,10 @@ describe PagesDomain, models: true do
end
context
'for trusted certificate chain'
do
# We only validate that we can to rebuild the trust chain, for certificates
# We assume that 'AddTrustExternalCARoot' needed to validate the chain is in trusted store.
# It will be if ca-certificates is installed on Debian/Ubuntu/Alpine
let
(
:domain
)
{
build
(
:pages_domain
,
:with_trusted_chain
)
}
it
{
is_expected
.
to
be_truthy
}
...
...
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