summaryrefslogtreecommitdiff
path: root/spec/features
diff options
context:
space:
mode:
authorAlexis Reigel <mail@koffeinfrei.org>2017-06-26 14:29:01 +0200
committerAlexis Reigel <mail@koffeinfrei.org>2017-07-27 15:43:36 +0200
commit5013f3a8167bb7c665b19f44ae66e543fe0b2fce (patch)
treee81eab3f6eb537361b917c2a69596c03efe780ae /spec/features
parentafd7582af6a20d72b1d941d9849f331aee8f994a (diff)
downloadgitlab-ce-5013f3a8167bb7c665b19f44ae66e543fe0b2fce.tar.gz
use updated gitlab-test repo for signed commits
Diffstat (limited to 'spec/features')
-rw-r--r--spec/features/commits_spec.rb24
1 files changed, 5 insertions, 19 deletions
diff --git a/spec/features/commits_spec.rb b/spec/features/commits_spec.rb
index 236e3089c6c..274247fc4d3 100644
--- a/spec/features/commits_spec.rb
+++ b/spec/features/commits_spec.rb
@@ -1,5 +1,4 @@
require 'spec_helper'
-require 'fileutils'
describe 'Commits' do
include CiStatusHelper
@@ -206,19 +205,6 @@ describe 'Commits' do
end
describe 'GPG signed commits' do
- before do
- # FIXME: add this to the test repository directly
- remote_path = project.repository.path_to_repo
- Dir.mktmpdir do |dir|
- FileUtils.cd dir do
- `git clone --quiet #{remote_path} .`
- `git commit --quiet -S#{GpgHelpers::User1.primary_keyid} --allow-empty -m "signed commit by nannie bernhard"`
- `git commit --quiet -S#{GpgHelpers::User2.primary_keyid} --allow-empty -m "signed commit by bette cartwright"`
- `git push --quiet`
- end
- end
- end
-
it 'changes from unverified to verified when the user changes his email to match the gpg key' do
user = create :user, email: 'unrelated.user@example.org'
project.team << [user, :master]
@@ -229,7 +215,7 @@ describe 'Commits' do
login_with(user)
- visit namespace_project_commits_path(project.namespace, project, :master)
+ visit namespace_project_commits_path(project.namespace, project, :'signed-commits')
within '#commits-list' do
expect(page).to have_content 'Unverified'
@@ -242,7 +228,7 @@ describe 'Commits' do
user.update_attributes!(email: GpgHelpers::User1.emails.first)
end
- visit namespace_project_commits_path(project.namespace, project, :master)
+ visit namespace_project_commits_path(project.namespace, project, :'signed-commits')
within '#commits-list' do
expect(page).to have_content 'Unverified'
@@ -256,7 +242,7 @@ describe 'Commits' do
login_with(user)
- visit namespace_project_commits_path(project.namespace, project, :master)
+ visit namespace_project_commits_path(project.namespace, project, :'signed-commits')
within '#commits-list' do
expect(page).to have_content 'Unverified'
@@ -268,7 +254,7 @@ describe 'Commits' do
create :gpg_key, key: GpgHelpers::User1.public_key, user: user
end
- visit namespace_project_commits_path(project.namespace, project, :master)
+ visit namespace_project_commits_path(project.namespace, project, :'signed-commits')
within '#commits-list' do
expect(page).to have_content 'Unverified'
@@ -284,7 +270,7 @@ describe 'Commits' do
end
login_with(user)
- visit namespace_project_commits_path(project.namespace, project, :master)
+ visit namespace_project_commits_path(project.namespace, project, :'signed-commits')
click_on 'Verified'
within '.popover' do