From f7ac8a3462938353e6fd4742b31b7fe97a771cda Mon Sep 17 00:00:00 2001 From: Alex Denisov <1101.debian@gmail.com> Date: Sun, 2 Dec 2012 22:18:03 +0200 Subject: [PATCH 1/4] Tests on EventFilters added --- features/dashboard/event_filters.feature | 14 +++++ .../dashboard/dashboard_event_filters.rb | 63 +++++++++++++++++++ 2 files changed, 77 insertions(+) create mode 100644 features/dashboard/event_filters.feature create mode 100644 features/steps/dashboard/dashboard_event_filters.rb diff --git a/features/dashboard/event_filters.feature b/features/dashboard/event_filters.feature new file mode 100644 index 00000000000..e3e6eced8fb --- /dev/null +++ b/features/dashboard/event_filters.feature @@ -0,0 +1,14 @@ +Feature: Event filters + Background: + Given I sign in as a user + And I own a project + And this project has push event + And this project has new member event + And this project has merge request event + And I visit dashboard page + + Scenario: I should see all events + Then I should see push event + Then I should see new member event + Then I should see merge request event + diff --git a/features/steps/dashboard/dashboard_event_filters.rb b/features/steps/dashboard/dashboard_event_filters.rb new file mode 100644 index 00000000000..cb821ca327a --- /dev/null +++ b/features/steps/dashboard/dashboard_event_filters.rb @@ -0,0 +1,63 @@ +class EventFilters < Spinach::FeatureSteps + include SharedAuthentication + include SharedPaths + include SharedProject + + Then 'I should see push event' do + page.find('span.pushed').should have_content('pushed') + end + + Then 'I should see new member event' do + page.find('span.joined').should have_content('joined') + end + + Then 'I should see merge request event' do + page.find('span.merged').should have_content('merged') + end + + And 'this project has push event' do + data = { + before: "0000000000000000000000000000000000000000", + after: "0220c11b9a3e6c69dc8fd35321254ca9a7b98f7e", + ref: "refs/heads/new_design", + user_id: @user.id, + user_name: @user.name, + repository: { + name: @project.name, + url: "localhost/rubinius", + description: "", + homepage: "localhost/rubinius", + private: true + } + } + + @event = Event.create( + project: @project, + action: Event::Pushed, + data: data, + author_id: @user.id + ) + end + + And 'this project has new member event' do + user = create(:user, {name: "John Doe"}) + Event.create( + project: @project, + author_id: user.id, + action: Event::Joined + ) + end + + And 'this project has merge request event' do + merge_request = create :merge_request, author: @user, project: @project + Event.create( + project: @project, + action: Event::Merged, + target_id: merge_request.id, + target_type: "MergeRequest", + author_id: @user.id + ) + end + +end + -- GitLab From 45e78b3114c974680f575dfe71820aa824bdfc3e Mon Sep 17 00:00:00 2001 From: Alex Denisov <1101.debian@gmail.com> Date: Sun, 2 Dec 2012 22:54:19 +0200 Subject: [PATCH 2/4] Tests on events filtering added --- app/helpers/events_helper.rb | 2 +- features/dashboard/event_filters.feature | 19 +++++++++++- .../dashboard/dashboard_event_filters.rb | 30 +++++++++++++++++-- 3 files changed, 46 insertions(+), 5 deletions(-) diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb index a2548a23e5e..9899df3a931 100644 --- a/app/helpers/events_helper.rb +++ b/app/helpers/events_helper.rb @@ -46,7 +46,7 @@ module EventsHelper end content_tag :div, class: "filter_icon #{inactive}" do - link_to dashboard_path(event_filter: filter), class: 'has_tooltip', 'data-original-title' => tooltip do + link_to dashboard_path(event_filter: filter), class: 'has_tooltip', id: "#{key}_event_filter", 'data-original-title' => tooltip do image_tag "event_filter_#{key}.png" end end diff --git a/features/dashboard/event_filters.feature b/features/dashboard/event_filters.feature index e3e6eced8fb..050d98951a8 100644 --- a/features/dashboard/event_filters.feature +++ b/features/dashboard/event_filters.feature @@ -9,6 +9,23 @@ Feature: Event filters Scenario: I should see all events Then I should see push event + And I should see new member event + And I should see merge request event + + Scenario: I should see only pushed events + When I click "push" event filter + Then I should see push event + And I should not see new member event + And I should not see merge request event + + Scenario: I should see only joined events + When I click "team" event filter Then I should see new member event - Then I should see merge request event + And I should not see push event + And I should not see merge request event + Scenario: I should see only merged events + When I click "merge" event filter + Then I should see merge request event + And I should not see push event + And I should not see new member event diff --git a/features/steps/dashboard/dashboard_event_filters.rb b/features/steps/dashboard/dashboard_event_filters.rb index cb821ca327a..03a0bd85e43 100644 --- a/features/steps/dashboard/dashboard_event_filters.rb +++ b/features/steps/dashboard/dashboard_event_filters.rb @@ -4,15 +4,27 @@ class EventFilters < Spinach::FeatureSteps include SharedProject Then 'I should see push event' do - page.find('span.pushed').should have_content('pushed') + page.has_selector?('span.pushed').should be_true + end + + Then 'I should not see push event' do + page.has_selector?('span.pushed').should be_false end Then 'I should see new member event' do - page.find('span.joined').should have_content('joined') + page.has_selector?('span.joined').should be_true + end + + And 'I should not see new member event' do + page.has_selector?('span.joined').should be_false end Then 'I should see merge request event' do - page.find('span.merged').should have_content('merged') + page.has_selector?('span.merged').should be_true + end + + And 'I should not see merge request event' do + page.has_selector?('span.merged').should be_false end And 'this project has push event' do @@ -59,5 +71,17 @@ class EventFilters < Spinach::FeatureSteps ) end + When 'I click "push" event filter' do + click_link("push_event_filter") + end + + When 'I click "team" event filter' do + click_link("team_event_filter") + end + + When 'I click "merge" event filter' do + click_link("merged_event_filter") + end + end -- GitLab From eb5804f23ed2beba0e8d54c1e5efda499f8dae84 Mon Sep 17 00:00:00 2001 From: Alex Denisov <1101.debian@gmail.com> Date: Mon, 3 Dec 2012 02:29:07 +0200 Subject: [PATCH 3/4] Event filters stores at cookies. --- app/assets/javascripts/dashboard.js | 27 +++++++++++++++++++ app/controllers/dashboard_controller.rb | 3 ++- app/helpers/events_helper.rb | 5 +--- app/views/dashboard/index.html.haml | 7 +++-- features/dashboard/event_filters.feature | 19 +++++++++++++ .../dashboard/dashboard_event_filters.rb | 12 ++++----- 6 files changed, 60 insertions(+), 13 deletions(-) create mode 100644 app/assets/javascripts/dashboard.js diff --git a/app/assets/javascripts/dashboard.js b/app/assets/javascripts/dashboard.js new file mode 100644 index 00000000000..0261926af2b --- /dev/null +++ b/app/assets/javascripts/dashboard.js @@ -0,0 +1,27 @@ +/** + * Init dashboard page + * + */ +function dashboardPage(){ + $(".event_filter_link").bind('click',(function(){ + enableFilter(this.id); + })); +} + +function enableFilter(sender_id){ + var event_filters = $.cookie('event_filter'); + var filter = sender_id.split('_')[0]; + if (!event_filters) { + event_filters = new Array(); + } else { + event_filters = event_filters.split(','); + } + var index = event_filters.indexOf(filter); + if (index == -1) { + event_filters.push(filter); + } else { + event_filters.splice(index, 1); + } + $.cookie('event_filter', event_filters.join(',')); +}; + diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb index 461dd51b570..57b5d312c01 100644 --- a/app/controllers/dashboard_controller.rb +++ b/app/controllers/dashboard_controller.rb @@ -58,7 +58,8 @@ class DashboardController < ApplicationController end def event_filter - @event_filter ||= EventFilter.new(params[:event_filter]) + filters = cookies['event_filter'].split(',') if cookies['event_filter'] + @event_filter ||= EventFilter.new(filters) end def dashboard_filter items diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb index 9899df3a931..f58d7f7b852 100644 --- a/app/helpers/events_helper.rb +++ b/app/helpers/events_helper.rb @@ -36,9 +36,6 @@ module EventsHelper def event_filter_link key, tooltip key = key.to_s - - filter = @event_filter.options key - inactive = if @event_filter.active? key nil else @@ -46,7 +43,7 @@ module EventsHelper end content_tag :div, class: "filter_icon #{inactive}" do - link_to dashboard_path(event_filter: filter), class: 'has_tooltip', id: "#{key}_event_filter", 'data-original-title' => tooltip do + link_to dashboard_path, class: 'has_tooltip event_filter_link', id: "#{key}_event_filter", 'data-original-title' => tooltip do image_tag "event_filter_#{key}.png" end end diff --git a/app/views/dashboard/index.html.haml b/app/views/dashboard/index.html.haml index 6b360dc1fef..1f94a16bcae 100644 --- a/app/views/dashboard/index.html.haml +++ b/app/views/dashboard/index.html.haml @@ -1,3 +1,4 @@ += javascript_include_tag 'dashboard' - if @projects.any? .projects .activities.span8 @@ -45,6 +46,8 @@ - else If you will be added to project - it will be displayed here - :javascript - $(function(){ Pager.init(20); }); + $(function(){ + dashboardPage(); + Pager.init(20); + }); diff --git a/features/dashboard/event_filters.feature b/features/dashboard/event_filters.feature index 050d98951a8..158d3e1cfa9 100644 --- a/features/dashboard/event_filters.feature +++ b/features/dashboard/event_filters.feature @@ -12,20 +12,39 @@ Feature: Event filters And I should see new member event And I should see merge request event + @javascript Scenario: I should see only pushed events When I click "push" event filter Then I should see push event And I should not see new member event And I should not see merge request event + @javascript Scenario: I should see only joined events When I click "team" event filter Then I should see new member event And I should not see push event And I should not see merge request event + @javascript Scenario: I should see only merged events When I click "merge" event filter Then I should see merge request event And I should not see push event And I should not see new member event + + @javascript + Scenario: I should see only selected events while page reloaded + When I click "push" event filter + And I visit dashboard page + Then I should see push event + And I should not see new member event + When I click "team" event filter + And I visit dashboard page + Then I should see push event + And I should see new member event + And I should not see merge request event + When I click "push" event + Then I should not see push event + And I should see new member event + And I should not see merge request event diff --git a/features/steps/dashboard/dashboard_event_filters.rb b/features/steps/dashboard/dashboard_event_filters.rb index 03a0bd85e43..bfc053631ab 100644 --- a/features/steps/dashboard/dashboard_event_filters.rb +++ b/features/steps/dashboard/dashboard_event_filters.rb @@ -4,27 +4,27 @@ class EventFilters < Spinach::FeatureSteps include SharedProject Then 'I should see push event' do - page.has_selector?('span.pushed').should be_true + page.should have_selector('span.pushed') end Then 'I should not see push event' do - page.has_selector?('span.pushed').should be_false + page.should_not have_selector('span.pushed') end Then 'I should see new member event' do - page.has_selector?('span.joined').should be_true + page.should have_selector('span.joined') end And 'I should not see new member event' do - page.has_selector?('span.joined').should be_false + page.should_not have_selector('span.joined') end Then 'I should see merge request event' do - page.has_selector?('span.merged').should be_true + page.should have_selector('span.merged') end And 'I should not see merge request event' do - page.has_selector?('span.merged').should be_false + page.should_not have_selector('span.merged') end And 'this project has push event' do -- GitLab From af4d15ed2013a5129ff4693d4f29738922d0dc23 Mon Sep 17 00:00:00 2001 From: Alex Denisov <1101.debian@gmail.com> Date: Mon, 3 Dec 2012 07:09:05 +0200 Subject: [PATCH 4/4] Typo fixed --- features/dashboard/event_filters.feature | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/features/dashboard/event_filters.feature b/features/dashboard/event_filters.feature index 158d3e1cfa9..635bf40570d 100644 --- a/features/dashboard/event_filters.feature +++ b/features/dashboard/event_filters.feature @@ -44,7 +44,7 @@ Feature: Event filters Then I should see push event And I should see new member event And I should not see merge request event - When I click "push" event + When I click "push" event filter Then I should not see push event And I should see new member event And I should not see merge request event -- GitLab