Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRiccardo Padovani <riccardo@rpadovani.com>2018-02-21 20:20:56 +0300
committerClement Ho <clemmakesapps@gmail.com>2018-02-21 20:20:56 +0300
commit99b96a7b5f5615021bb023e8c8ef4d8827eb9cef (patch)
tree85121005f509f1acd8b9575d5a0304e99853dd92 /spec/features/milestone_spec.rb
parent576dd646c8436641f03a5b94e1daaecbe90b78c5 (diff)
#28481: Display time tracking totals on milestone page
Diffstat (limited to 'spec/features/milestone_spec.rb')
-rw-r--r--spec/features/milestone_spec.rb15
1 files changed, 9 insertions, 6 deletions
diff --git a/spec/features/milestone_spec.rb b/spec/features/milestone_spec.rb
index b02d2d4261c..cc12a1005ba 100644
--- a/spec/features/milestone_spec.rb
+++ b/spec/features/milestone_spec.rb
@@ -66,15 +66,16 @@ feature 'Milestone' do
end
end
- feature 'Open a milestone' do
+ feature 'Open a milestone', :js do
scenario 'shows total issue time spent correctly when no time has been logged' do
milestone = create(:milestone, project: project, title: 8.7)
visit project_milestone_path(project, milestone)
- page.within('.block.time_spent') do
- expect(page).to have_content 'No time spent'
- expect(page).to have_content 'None'
+ wait_for_requests
+
+ page.within('.time-tracking-no-tracking-pane') do
+ expect(page).to have_content 'No estimate or time spent'
end
end
@@ -89,8 +90,10 @@ feature 'Milestone' do
visit project_milestone_path(project, milestone)
- page.within('.block.time_spent') do
- expect(page).to have_content '3h'
+ wait_for_requests
+
+ page.within('.time-tracking-spend-only-pane') do
+ expect(page).to have_content 'Spent: 3h'
end
end
end