3 files changed, 179 insertions, 1 deletions

diff --git a/spec/features/users/login_spec.rb b/spec/features/users/login_spec.rb
index 5a537c1d4df..1d1120709b5 100644
--- a/spec/features/users/login_spec.rb
+++ b/spec/features/users/login_spec.rb
@@ -765,7 +765,7 @@ RSpec.describe 'Login' do
           click_link 'Proceed'
 
           expect(current_path).to eq(profile_account_path)
-          expect(page).to have_content('Congratulations! You have enabled Two-factor Authentication!')
+          expect(page).to have_content('You have set up 2FA for your account! If you lose access to your 2FA device, you can use your recovery codes to access your account. Alternatively, if you upload an SSH key, you can use that key to generate additional recovery codes.')
         end
       end
 
diff --git a/spec/features/users/overview_spec.rb b/spec/features/users/overview_spec.rb
index 67216b04504..902079b7b93 100644
--- a/spec/features/users/overview_spec.rb
+++ b/spec/features/users/overview_spec.rb
@@ -151,6 +151,132 @@ RSpec.describe 'Overview tab on a user profile', :js do
     end
   end
 
+  describe 'followers section' do
+    describe 'user has no followers' do
+      before do
+        visit user.username
+        page.find('.js-followers-tab a').click
+        wait_for_requests
+      end
+
+      it 'shows an empty followers list with an info message' do
+        page.within('#followers') do
+          expect(page).to have_content('You do not have any followers')
+          expect(page).not_to have_selector('.gl-card.gl-mb-5')
+          expect(page).not_to have_selector('.gl-pagination')
+        end
+      end
+    end
+
+    describe 'user has less then 20 followers' do
+      let(:follower) { create(:user) }
+
+      before do
+        follower.follow(user)
+        visit user.username
+        page.find('.js-followers-tab a').click
+        wait_for_requests
+      end
+
+      it 'shows followers' do
+        page.within('#followers') do
+          expect(page).to have_content(follower.name)
+          expect(page).to have_selector('.gl-card.gl-mb-5')
+          expect(page).not_to have_selector('.gl-pagination')
+        end
+      end
+    end
+
+    describe 'user has more then 20 followers' do
+      let(:other_users) { create_list(:user, 21) }
+
+      before do
+        other_users.each do |follower|
+          follower.follow(user)
+        end
+
+        visit user.username
+        page.find('.js-followers-tab a').click
+        wait_for_requests
+      end
+      it 'shows paginated followers' do
+        page.within('#followers') do
+          other_users.each_with_index do |follower, i|
+            break if i == 20
+
+            expect(page).to have_content(follower.name)
+          end
+          expect(page).to have_selector('.gl-card.gl-mb-5')
+          expect(page).to have_selector('.gl-pagination')
+          expect(page).to have_selector('.gl-pagination .js-pagination-page', count: 2)
+        end
+      end
+    end
+  end
+
+  describe 'following section' do
+    describe 'user is not following others' do
+      before do
+        visit user.username
+        page.find('.js-following-tab a').click
+        wait_for_requests
+      end
+
+      it 'shows an empty following list with an info message' do
+        page.within('#following') do
+          expect(page).to have_content('You are not following other users')
+          expect(page).not_to have_selector('.gl-card.gl-mb-5')
+          expect(page).not_to have_selector('.gl-pagination')
+        end
+      end
+    end
+
+    describe 'user is following less then 20 people' do
+      let(:followee) { create(:user) }
+
+      before do
+        user.follow(followee)
+        visit user.username
+        page.find('.js-following-tab a').click
+        wait_for_requests
+      end
+
+      it 'shows following user' do
+        page.within('#following') do
+          expect(page).to have_content(followee.name)
+          expect(page).to have_selector('.gl-card.gl-mb-5')
+          expect(page).not_to have_selector('.gl-pagination')
+        end
+      end
+    end
+
+    describe 'user is following more then 20 people' do
+      let(:other_users) { create_list(:user, 21) }
+
+      before do
+        other_users.each do |followee|
+          user.follow(followee)
+        end
+
+        visit user.username
+        page.find('.js-following-tab a').click
+        wait_for_requests
+      end
+      it 'shows paginated following' do
+        page.within('#following') do
+          other_users.each_with_index do |followee, i|
+            break if i == 20
+
+            expect(page).to have_content(followee.name)
+          end
+          expect(page).to have_selector('.gl-card.gl-mb-5')
+          expect(page).to have_selector('.gl-pagination')
+          expect(page).to have_selector('.gl-pagination .js-pagination-page', count: 2)
+        end
+      end
+    end
+  end
+
   describe 'bot user' do
     let(:bot_user) { create(:user, user_type: :security_bot) }
 
diff --git a/spec/features/users/show_spec.rb b/spec/features/users/show_spec.rb
index 6aeb3023db8..a8372800700 100644
--- a/spec/features/users/show_spec.rb
+++ b/spec/features/users/show_spec.rb
@@ -20,6 +20,8 @@ RSpec.describe 'User page' do
         expect(page).to have_link('Contributed projects')
         expect(page).to have_link('Personal projects')
         expect(page).to have_link('Snippets')
+        expect(page).to have_link('Followers')
+        expect(page).to have_link('Following')
       end
     end
 
@@ -54,6 +56,50 @@ RSpec.describe 'User page' do
         expect(page).to have_content('GitLab - work info test')
       end
     end
+
+    context 'follow/unfollow and followers/following' do
+      let_it_be(:followee) { create(:user) }
+      let_it_be(:follower) { create(:user) }
+
+      it 'does not show link to follow' do
+        subject
+
+        expect(page).not_to have_link(text: 'Follow', class: 'gl-button')
+      end
+
+      it 'shows 0 followers and 0 following' do
+        subject
+
+        expect(page).to have_content('0 followers')
+        expect(page).to have_content('0 following')
+      end
+
+      it 'shows 1 followers and 1 following' do
+        follower.follow(user)
+        user.follow(followee)
+
+        subject
+
+        expect(page).to have_content('1 follower')
+        expect(page).to have_content('1 following')
+      end
+
+      it 'does show link to follow' do
+        sign_in(user)
+        visit user_path(followee)
+
+        expect(page).to have_link(text: 'Follow', class: 'gl-button')
+      end
+
+      it 'does show link to unfollow' do
+        sign_in(user)
+        user.follow(followee)
+
+        visit user_path(followee)
+
+        expect(page).to have_link(text: 'Unfollow', class: 'gl-button')
+      end
+    end
   end
 
   context 'with private profile' do
@@ -83,6 +129,8 @@ RSpec.describe 'User page' do
         expect(page).to have_link('Contributed projects')
         expect(page).to have_link('Personal projects')
         expect(page).to have_link('Snippets')
+        expect(page).to have_link('Followers')
+        expect(page).to have_link('Following')
       end
     end
   end
@@ -242,6 +290,8 @@ RSpec.describe 'User page' do
           expect(page).not_to have_link('Contributed projects')
           expect(page).not_to have_link('Personal projects')
           expect(page).not_to have_link('Snippets')
+          expect(page).not_to have_link('Followers')
+          expect(page).not_to have_link('Following')
         end
       end
     end
@@ -261,6 +311,8 @@ RSpec.describe 'User page' do
           expect(page).to have_link('Contributed projects')
           expect(page).to have_link('Personal projects')
           expect(page).to have_link('Snippets')
+          expect(page).to have_link('Followers')
+          expect(page).to have_link('Following')
         end
       end
     end