Commit 7569010b authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Fix tests and last push widget

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent c11e4314
...@@ -14,6 +14,7 @@ v 8.0.0 (unreleased) ...@@ -14,6 +14,7 @@ v 8.0.0 (unreleased)
- Create cross-reference for closing references on commits pushed to non-default branches (Maël Valais) - Create cross-reference for closing references on commits pushed to non-default branches (Maël Valais)
- Ability to search milestones - Ability to search milestones
- Gracefully handle SMTP user input errors (e.g. incorrect email addresses) to prevent Sidekiq retries (Stan Hu) - Gracefully handle SMTP user input errors (e.g. incorrect email addresses) to prevent Sidekiq retries (Stan Hu)
- Move dashboard activity to separate page
v 7.14.1 (unreleased) v 7.14.1 (unreleased)
- Only include base URL in OmniAuth full_host parameter (Stan Hu) - Only include base URL in OmniAuth full_host parameter (Stan Hu)
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
%section.activities.col-md-8 %section.activities.col-md-8
= render 'dashboard/activities' = render 'dashboard/activities'
%aside.col-md-4 %aside.col-md-4
.panel.panel-default .panel.panel-default.projects-list-holder
.panel-heading.clearfix .panel-heading.clearfix
.input-group .input-group
= search_field_tag :filter_projects, nil, placeholder: 'Filter by name', class: 'projects-list-filter form-control' = search_field_tag :filter_projects, nil, placeholder: 'Filter by name', class: 'projects-list-filter form-control'
......
...@@ -4,6 +4,9 @@ ...@@ -4,6 +4,9 @@
= render 'dashboard/projects_head' = render 'dashboard/projects_head'
- if @last_push
= render "events/event_last_push", event: @last_push
- if @projects.any? - if @projects.any?
= render 'projects' = render 'projects'
- else - else
......
...@@ -9,6 +9,6 @@ ...@@ -9,6 +9,6 @@
#{time_ago_with_tooltip(event.created_at)} #{time_ago_with_tooltip(event.created_at)}
.pull-right .pull-right
= link_to new_mr_path_from_push_event(event), title: "New Merge Request", class: "btn btn-create btn-sm" do = link_to new_mr_path_from_push_event(event), title: "New Merge Request", class: "btn btn-info btn-sm" do
Create Merge Request Create Merge Request
%hr %hr
...@@ -10,6 +10,10 @@ Feature: Dashboard ...@@ -10,6 +10,10 @@ Feature: Dashboard
Scenario: I should see projects list Scenario: I should see projects list
Then I should see "New Project" link Then I should see "New Project" link
Then I should see "Shop" project link Then I should see "Shop" project link
@javascript
Scenario: I should see activity list
And I visit dashboard activity page
Then I should see project "Shop" activity feed Then I should see project "Shop" activity feed
Scenario: I should see groups list Scenario: I should see groups list
...@@ -26,12 +30,12 @@ Feature: Dashboard ...@@ -26,12 +30,12 @@ Feature: Dashboard
@javascript @javascript
Scenario: I should see User joined Project event Scenario: I should see User joined Project event
Given user with name "John Doe" joined project "Shop" Given user with name "John Doe" joined project "Shop"
When I visit dashboard page When I visit dashboard activity page
Then I should see "John Doe joined project Shop" event Then I should see "John Doe joined project Shop" event
@javascript @javascript
Scenario: I should see User left Project event Scenario: I should see User left Project event
Given user with name "John Doe" joined project "Shop" Given user with name "John Doe" joined project "Shop"
And user with name "John Doe" left project "Shop" And user with name "John Doe" left project "Shop"
When I visit dashboard page When I visit dashboard activity page
Then I should see "John Doe left project Shop" event Then I should see "John Doe left project Shop" event
...@@ -6,7 +6,7 @@ Feature: Event Filters ...@@ -6,7 +6,7 @@ Feature: Event Filters
And this project has push event And this project has push event
And this project has new member event And this project has new member event
And this project has merge request event And this project has merge request event
And I visit dashboard page And I visit dashboard activity page
@javascript @javascript
Scenario: I should see all events Scenario: I should see all events
...@@ -38,11 +38,11 @@ Feature: Event Filters ...@@ -38,11 +38,11 @@ Feature: Event Filters
@javascript @javascript
Scenario: I should see only selected events while page reloaded Scenario: I should see only selected events while page reloaded
When I click "push" event filter When I click "push" event filter
And I visit dashboard page And I visit dashboard activity page
Then I should see push event Then I should see push event
And I should not see new member event And I should not see new member event
When I click "team" event filter When I click "team" event filter
And I visit dashboard page And I visit dashboard activity page
Then I should see push event Then I should see push event
And I should see new member event And I should see new member event
And I should not see merge request event And I should not see merge request event
......
...@@ -71,6 +71,10 @@ module SharedPaths ...@@ -71,6 +71,10 @@ module SharedPaths
visit dashboard_path visit dashboard_path
end end
step 'I visit dashboard activity page' do
visit activity_dashboard_path
end
step 'I visit dashboard projects page' do step 'I visit dashboard projects page' do
visit projects_dashboard_path visit projects_dashboard_path
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment