Merge remote-tracking branch 'upstream/master' into 28717-additional-metrics-review-branch28717-additional-metrics-review-branch

1 files changed, 8 insertions, 8 deletions

diff --git a/spec/features/boards/boards_spec.rb b/spec/features/boards/boards_spec.rb
index 968cc9d9c80..87fc31d414c 100644
--- a/spec/features/boards/boards_spec.rb
+++ b/spec/features/boards/boards_spec.rb
@@ -12,7 +12,7 @@ describe 'Issue Boards', feature: true, js: true do
     project.team << [user, :master]
     project.team << [user2, :master]
 
-    login_as(user)
+    gitlab_sign_in(user)
   end
 
   context 'no lists' do
@@ -247,13 +247,13 @@ describe 'Issue Boards', feature: true, js: true do
       end
 
       it 'issue moves from closed' do
-        drag(list_from_index: 3, list_to_index: 2)
+        drag(list_from_index: 2, list_to_index: 3)
 
         wait_for_board_cards(2, 8)
-        wait_for_board_cards(3, 3)
-        wait_for_board_cards(4, 0)
+        wait_for_board_cards(3, 1)
+        wait_for_board_cards(4, 2)
 
-        expect(find('.board:nth-child(3)')).to have_content(issue8.title)
+        expect(find('.board:nth-child(4)')).to have_content(issue8.title)
       end
 
       context 'issue card' do
@@ -519,7 +519,7 @@ describe 'Issue Boards', feature: true, js: true do
 
   context 'signed out user' do
     before do
-      logout
+      gitlab_sign_out
       visit namespace_project_board_path(project.namespace, project, board)
       wait_for_requests
     end
@@ -542,8 +542,8 @@ describe 'Issue Boards', feature: true, js: true do
 
     before do
       project.team << [user_guest, :guest]
-      logout
-      login_as(user_guest)
+      gitlab_sign_out
+      gitlab_sign_in(user_guest)
       visit namespace_project_board_path(project.namespace, project, board)
       wait_for_requests
     end