Fix signed commits spec

1 files changed, 33 insertions, 28 deletions

diff --git a/spec/features/signed_commits_spec.rb b/spec/features/signed_commits_spec.rb
index 6088b831c14..db141ef7096 100644
--- a/spec/features/signed_commits_spec.rb
+++ b/spec/features/signed_commits_spec.rb
@@ -96,10 +96,11 @@ describe 'GPG signed commits', :js do
 
       within(find('.commit', text: 'signed commit by bette cartwright')) do
         click_on 'Unverified'
-        within '.popover' do
-          expect(page).to have_content 'This commit was signed with an unverified signature.'
-          expect(page).to have_content "GPG Key ID: #{GpgHelpers::User2.primary_keyid}"
-        end
+      end
+
+      within '.popover' do
+        expect(page).to have_content 'This commit was signed with an unverified signature.'
+        expect(page).to have_content "GPG Key ID: #{GpgHelpers::User2.primary_keyid}"
       end
     end
 
@@ -110,12 +111,13 @@ describe 'GPG signed commits', :js do
 
       within(find('.commit', text: 'signed and authored commit by bette cartwright, different email')) do
         click_on 'Unverified'
-        within '.popover' do
-          expect(page).to have_content 'This commit was signed with a verified signature, but the committer email is not verified to belong to the same user.'
-          expect(page).to have_content 'Bette Cartwright'
-          expect(page).to have_content '@bette.cartwright'
-          expect(page).to have_content "GPG Key ID: #{GpgHelpers::User2.primary_keyid}"
-        end
+      end
+
+      within '.popover' do
+        expect(page).to have_content 'This commit was signed with a verified signature, but the committer email is not verified to belong to the same user.'
+        expect(page).to have_content 'Bette Cartwright'
+        expect(page).to have_content '@bette.cartwright'
+        expect(page).to have_content "GPG Key ID: #{GpgHelpers::User2.primary_keyid}"
       end
     end
 
@@ -126,12 +128,13 @@ describe 'GPG signed commits', :js do
 
       within(find('.commit', text: 'signed commit by bette cartwright')) do
         click_on 'Unverified'
-        within '.popover' do
-          expect(page).to have_content "This commit was signed with a different user's verified signature."
-          expect(page).to have_content 'Bette Cartwright'
-          expect(page).to have_content '@bette.cartwright'
-          expect(page).to have_content "GPG Key ID: #{GpgHelpers::User2.primary_keyid}"
-        end
+      end
+
+      within '.popover' do
+        expect(page).to have_content "This commit was signed with a different user's verified signature."
+        expect(page).to have_content 'Bette Cartwright'
+        expect(page).to have_content '@bette.cartwright'
+        expect(page).to have_content "GPG Key ID: #{GpgHelpers::User2.primary_keyid}"
       end
     end
 
@@ -142,12 +145,13 @@ describe 'GPG signed commits', :js do
 
       within(find('.commit', text: 'signed and authored commit by nannie bernhard')) do
         click_on 'Verified'
-        within '.popover' do
-          expect(page).to have_content 'This commit was signed with a verified signature and the committer email is verified to belong to the same user.'
-          expect(page).to have_content 'Nannie Bernhard'
-          expect(page).to have_content '@nannie.bernhard'
-          expect(page).to have_content "GPG Key ID: #{GpgHelpers::User1.primary_keyid}"
-        end
+      end
+
+      within '.popover' do
+        expect(page).to have_content 'This commit was signed with a verified signature and the committer email is verified to belong to the same user.'
+        expect(page).to have_content 'Nannie Bernhard'
+        expect(page).to have_content '@nannie.bernhard'
+        expect(page).to have_content "GPG Key ID: #{GpgHelpers::User1.primary_keyid}"
       end
     end
 
@@ -167,12 +171,13 @@ describe 'GPG signed commits', :js do
 
       within(find('.commit', text: 'signed and authored commit by nannie bernhard')) do
         click_on 'Verified'
-        within '.popover' do
-          expect(page).to have_content 'This commit was signed with a verified signature and the committer email is verified to belong to the same user.'
-          expect(page).to have_content 'Nannie Bernhard'
-          expect(page).to have_content 'nannie.bernhard@example.com'
-          expect(page).to have_content "GPG Key ID: #{GpgHelpers::User1.primary_keyid}"
-        end
+      end
+
+      within '.popover' do
+        expect(page).to have_content 'This commit was signed with a verified signature and the committer email is verified to belong to the same user.'
+        expect(page).to have_content 'Nannie Bernhard'
+        expect(page).to have_content 'nannie.bernhard@example.com'
+        expect(page).to have_content "GPG Key ID: #{GpgHelpers::User1.primary_keyid}"
       end
     end
   end