From 4e8a2feb718face21a6024540c7bfd2bccd6ea25 Mon Sep 17 00:00:00 2001
From: Mehdi Lahmam <mehdi@lahmam.com>
Date: Thu, 10 Aug 2017 08:41:41 +0200
Subject: Add feature specs for Cycle Analytics pipeline summary

---
 spec/features/cycle_analytics_spec.rb | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/spec/features/cycle_analytics_spec.rb b/spec/features/cycle_analytics_spec.rb
index 5c60cca10b9..1e48cab98a4 100644
--- a/spec/features/cycle_analytics_spec.rb
+++ b/spec/features/cycle_analytics_spec.rb
@@ -24,6 +24,12 @@ feature 'Cycle Analytics', js: true do
         expect(page).to have_content('Introducing Cycle Analytics')
       end
 
+      it 'shows pipeline summary' do
+        expect(new_issues_counter).to have_content('-')
+        expect(commits_counter).to have_content('-')
+        expect(deploys_counter).to have_content('-')
+      end
+
       it 'shows active stage with empty message' do
         expect(page).to have_selector('.stage-nav-item.active', text: 'Issue')
         expect(page).to have_content("We don't have enough data to show this stage.")
@@ -42,6 +48,12 @@ feature 'Cycle Analytics', js: true do
         visit project_cycle_analytics_path(project)
       end
 
+      it 'shows pipeline summary' do
+        expect(new_issues_counter).to have_content('1')
+        expect(commits_counter).to have_content('2')
+        expect(deploys_counter).to have_content('1')
+      end
+
       it 'shows data on each stage' do
         expect_issue_to_be_present
 
@@ -109,6 +121,18 @@ feature 'Cycle Analytics', js: true do
     end
   end
 
+  def new_issues_counter
+    find(:xpath, "//p[contains(text(),'New Issue')]/preceding-sibling::h3")
+  end
+
+  def commits_counter
+    find(:xpath, "//p[contains(text(),'Commits')]/preceding-sibling::h3")
+  end
+
+  def deploys_counter
+    find(:xpath, "//p[contains(text(),'Deploy')]/preceding-sibling::h3")
+  end
+
   def expect_issue_to_be_present
     expect(find('.stage-events')).to have_content(issue.title)
     expect(find('.stage-events')).to have_content(issue.author.name)
-- 
cgit v1.2.1


From 6e3ca79dedbe27f64d12dbf391d0823137dcc610 Mon Sep 17 00:00:00 2001
From: Mehdi Lahmam <mehdi@lahmam.com>
Date: Thu, 10 Aug 2017 08:42:28 +0200
Subject: Add a `Last 7 days` option for Cycle Analytics view

---
 app/controllers/concerns/cycle_analytics_params.rb   |  9 ++++++++-
 app/views/projects/cycle_analytics/show.html.haml    |  3 +++
 changelogs/unreleased/seven-days-cycle-analytics.yml |  5 +++++
 spec/features/cycle_analytics_spec.rb                | 14 ++++++++++++++
 4 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 changelogs/unreleased/seven-days-cycle-analytics.yml

diff --git a/app/controllers/concerns/cycle_analytics_params.rb b/app/controllers/concerns/cycle_analytics_params.rb
index 52e06f4945a..1ab107168c0 100644
--- a/app/controllers/concerns/cycle_analytics_params.rb
+++ b/app/controllers/concerns/cycle_analytics_params.rb
@@ -6,6 +6,13 @@ module CycleAnalyticsParams
   end
 
   def start_date(params)
-    params[:start_date] == '30' ? 30.days.ago : 90.days.ago
+    case params[:start_date]
+    when '7'
+      7.days.ago
+    when '30'
+      30.days.ago
+    else
+      90.days.ago
+    end
   end
 end
diff --git a/app/views/projects/cycle_analytics/show.html.haml b/app/views/projects/cycle_analytics/show.html.haml
index c704635ead3..3467e357c49 100644
--- a/app/views/projects/cycle_analytics/show.html.haml
+++ b/app/views/projects/cycle_analytics/show.html.haml
@@ -39,6 +39,9 @@
                   %span.dropdown-label {{ n__('Last %d day', 'Last %d days', 30) }}
                   %i.fa.fa-chevron-down
                 %ul.dropdown-menu.dropdown-menu-align-right
+                  %li
+                    %a{ "href" => "#", "data-value" => "7" }
+                      {{ n__('Last %d day', 'Last %d days', 7) }}
                   %li
                     %a{ "href" => "#", "data-value" => "30" }
                       {{ n__('Last %d day', 'Last %d days', 30) }}
diff --git a/changelogs/unreleased/seven-days-cycle-analytics.yml b/changelogs/unreleased/seven-days-cycle-analytics.yml
new file mode 100644
index 00000000000..ff660bdd603
--- /dev/null
+++ b/changelogs/unreleased/seven-days-cycle-analytics.yml
@@ -0,0 +1,5 @@
+---
+title: Add a `Last 7 days` option for Cycle Analytics view
+merge_request: 13443
+author: Mehdi Lahmam (@mehlah)
+type: added
diff --git a/spec/features/cycle_analytics_spec.rb b/spec/features/cycle_analytics_spec.rb
index 1e48cab98a4..bfe9dac3bd4 100644
--- a/spec/features/cycle_analytics_spec.rb
+++ b/spec/features/cycle_analytics_spec.rb
@@ -75,6 +75,20 @@ feature 'Cycle Analytics', js: true do
         click_stage('Production')
         expect_issue_to_be_present
       end
+
+      context "when I change the time period observed" do
+        before do
+          _two_weeks_old_issue = create(:issue, project: project, created_at: 2.weeks.ago)
+
+          click_button('Last 30 days')
+          click_link('Last 7 days')
+          wait_for_requests
+        end
+
+        it 'shows only relevant data' do
+          expect(new_issues_counter).to have_content('1')
+        end
+      end
     end
 
     context "when my preferred language is Spanish" do
-- 
cgit v1.2.1