summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Vosmaer <jacob@gitlab.com>2016-08-10 10:25:16 +0200
committerJacob Vosmaer <jacob@gitlab.com>2016-08-10 10:25:16 +0200
commitad17617db6508207168370610063089faf85c452 (patch)
tree117de9927b3873dd6c17d13446f91d51155b616a
parentae21774c1f6a09ea5029194c66d229aeba1d22d6 (diff)
downloadgitlab-shell-ad17617db6508207168370610063089faf85c452.tar.gz
Changes proposed during review
-rw-r--r--lib/gitlab_keys.rb2
-rw-r--r--spec/gitlab_keys_spec.rb4
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/gitlab_keys.rb b/lib/gitlab_keys.rb
index 4034a86..d4c4102 100644
--- a/lib/gitlab_keys.rb
+++ b/lib/gitlab_keys.rb
@@ -9,7 +9,7 @@ class GitlabKeys
attr_accessor :auth_file, :key
def self.command(key_id)
- raise KeyError.new("Invalid key_id: #{key_id.inspect}") unless /\A[a-z0-9-]+\z/.match(key_id)
+ raise KeyError.new("Invalid key_id: #{key_id.inspect}") unless /\A[a-z0-9-]+\z/ =~ key_id
"#{ROOT_PATH}/bin/gitlab-shell #{key_id}"
end
diff --git a/spec/gitlab_keys_spec.rb b/spec/gitlab_keys_spec.rb
index a615eac..faf7c5d 100644
--- a/spec/gitlab_keys_spec.rb
+++ b/spec/gitlab_keys_spec.rb
@@ -14,7 +14,7 @@ describe GitlabKeys do
end
it 'raises KeyError on invalid input' do
- expect { described_class.command("\nssh-rsa AAA") }.to raise_error(GitlabKeys::KeyError)
+ expect { described_class.command("\nssh-rsa AAA") }.to raise_error(described_class::KeyError)
end
end
@@ -29,7 +29,7 @@ describe GitlabKeys do
end
it 'raises KeyError on invalid input' do
- expect { described_class.key_line('key-741', "ssh-rsa AAA\nssh-rsa AAA") }.to raise_error(GitlabKeys::KeyError)
+ expect { described_class.key_line('key-741', "ssh-rsa AAA\nssh-rsa AAA") }.to raise_error(described_class::KeyError)
end
end