BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
e9515dff
Commit
e9515dff
authored
Jun 28, 2017
by
Alexis Reigel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove the :gpg rspec tag
since everything (except the CurrentKeyChain method) operates on a tempoary keychain anyway we don't need this anymore.
parent
9a759c62
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
12 deletions
+12
-12
gpg_keys_spec.rb
spec/features/profiles/gpg_keys_spec.rb
+1
-1
gpg_spec.rb
spec/lib/gitlab/gpg_spec.rb
+8
-2
gpg_key_spec.rb
spec/models/gpg_key_spec.rb
+3
-3
spec_helper.rb
spec/spec_helper.rb
+0
-6
No files found.
spec/features/profiles/gpg_keys_spec.rb
View file @
e9515dff
require
'rails_helper'
feature
'Profile > GPG Keys'
,
:gpg
do
feature
'Profile > GPG Keys'
do
let
(
:user
)
{
create
(
:user
,
email:
GpgHelpers
::
User2
.
emails
.
first
)
}
before
do
...
...
spec/lib/gitlab/gpg_spec.rb
View file @
e9515dff
...
...
@@ -44,8 +44,14 @@ describe Gitlab::Gpg do
end
end
describe
Gitlab
::
Gpg
::
CurrentKeyChain
,
:gpg
do
describe
'.add'
,
:gpg
do
describe
Gitlab
::
Gpg
::
CurrentKeyChain
do
around
do
|
example
|
Gitlab
::
Gpg
.
using_tmp_keychain
do
example
.
run
end
end
describe
'.add'
do
it
'stores the key in the keychain'
do
expect
(
GPGME
::
Key
.
find
(
:public
,
GpgHelpers
::
User1
.
fingerprint
)).
to
eq
[]
...
...
spec/models/gpg_key_spec.rb
View file @
e9515dff
...
...
@@ -13,7 +13,7 @@ describe GpgKey do
it
{
is_expected
.
not_to
allow_value
(
'BEGIN PGP'
).
for
(
:key
)
}
end
context
'callbacks'
,
:gpg
do
context
'callbacks'
do
describe
'extract_fingerprint'
do
it
'extracts the fingerprint from the gpg key'
do
gpg_key
=
described_class
.
new
(
key:
GpgHelpers
::
User1
.
public_key
)
...
...
@@ -45,7 +45,7 @@ describe GpgKey do
end
end
describe
'#emails'
,
:gpg
do
describe
'#emails'
do
it
'returns the emails from the gpg key'
do
gpg_key
=
create
:gpg_key
,
key:
GpgHelpers
::
User1
.
public_key
...
...
@@ -53,7 +53,7 @@ describe GpgKey do
end
end
describe
'#emails_with_verified_status'
,
:gpg
do
describe
'#emails_with_verified_status'
do
it
'email is verified if the user has the matching email'
do
user
=
create
:user
,
email:
'bette.cartwright@example.com'
gpg_key
=
create
:gpg_key
,
key:
GpgHelpers
::
User2
.
public_key
,
user:
user
...
...
spec/spec_helper.rb
View file @
e9515dff
...
...
@@ -141,12 +141,6 @@ RSpec.configure do |config|
config
.
around
(
:each
,
:postgresql
)
do
|
example
|
example
.
run
if
Gitlab
::
Database
.
postgresql?
end
config
.
around
(
:each
,
:gpg
)
do
|
example
|
Gitlab
::
Gpg
.
using_tmp_keychain
do
example
.
run
end
end
end
FactoryGirl
::
SyntaxRunner
.
class_eval
do
...
...
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