1 files changed, 9 insertions, 6 deletions
diff --git a/spec/support/time_tracking_shared_examples.rb b/spec/support/time_tracking_shared_examples.rb
index 52f4fabdc47..84ef46ffa27 100644
--- a/spec/support/time_tracking_shared_examples.rb
+++ b/spec/support/time_tracking_shared_examples.rb
@@ -8,6 +8,7 @@ shared_examples 'issuable time tracker' do
   it 'updates the sidebar component when estimate is added' do
     submit_time('/estimate 3w 1d 1h')
 
+    wait_for_ajax
     page.within '.time-tracking-estimate-only-pane' do
       expect(page).to have_content '3w 1d 1h'
     end
@@ -16,6 +17,7 @@ shared_examples 'issuable time tracker' do
   it 'updates the sidebar component when spent is added' do
     submit_time('/spend 3w 1d 1h')
 
+    wait_for_ajax
     page.within '.time-tracking-spend-only-pane' do
       expect(page).to have_content '3w 1d 1h'
     end
@@ -25,6 +27,7 @@ shared_examples 'issuable time tracker' do
     submit_time('/estimate 3w 1d 1h')
     submit_time('/spend 3w 1d 1h')
 
+    wait_for_ajax
     page.within '.time-tracking-comparison-pane' do
       expect(page).to have_content '3w 1d 1h'
     end
@@ -34,7 +37,7 @@ shared_examples 'issuable time tracker' do
     submit_time('/estimate 3w 1d 1h')
     submit_time('/remove_estimate')
 
-    page.within '#issuable-time-tracker' do
+    page.within '.time-tracking-component-wrap' do
       expect(page).to have_content 'No estimate or time spent'
     end
   end
@@ -43,13 +46,13 @@ shared_examples 'issuable time tracker' do
     submit_time('/spend 3w 1d 1h')
     submit_time('/remove_time_spent')
 
-    page.within '#issuable-time-tracker' do
+    page.within '.time-tracking-component-wrap' do
       expect(page).to have_content 'No estimate or time spent'
     end
   end
 
   it 'shows the help state when icon is clicked' do
-    page.within '#issuable-time-tracker' do
+    page.within '.time-tracking-component-wrap' do
       find('.help-button').click
       expect(page).to have_content 'Track time with slash commands'
       expect(page).to have_content 'Learn more'
@@ -57,7 +60,7 @@ shared_examples 'issuable time tracker' do
   end
 
   it 'hides the help state when close icon is clicked' do
-    page.within '#issuable-time-tracker' do
+    page.within '.time-tracking-component-wrap' do
       find('.help-button').click
       find('.close-help-button').click
 
@@ -67,7 +70,7 @@ shared_examples 'issuable time tracker' do
   end
 
   it 'displays the correct help url' do
-    page.within '#issuable-time-tracker' do
+    page.within '.time-tracking-component-wrap' do
       find('.help-button').click
 
       expect(find_link('Learn more')[:href]).to have_content('/help/workflow/time_tracking.md')
@@ -77,6 +80,6 @@ end
 
 def submit_time(slash_command)
   fill_in 'note[note]', with: slash_command
-  find('.comment-btn').trigger('click')
+  find('.js-comment-submit-button').trigger('click')
   wait_for_ajax
 end