Commit 8b76e306 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Spianch test for group dashboard

parent 224fb577
...@@ -22,6 +22,10 @@ class Group < ActiveRecord::Base ...@@ -22,6 +22,10 @@ class Group < ActiveRecord::Base
delegate :name, to: :owner, allow_nil: true, prefix: true delegate :name, to: :owner, allow_nil: true, prefix: true
def self.search query
where("name like :query or code like :query", query: "%#{query}%")
end
def to_param def to_param
code code
end end
......
.projects .projects
.activities.span8 .activities.span8
.back_link = link_to dashboard_path, class: 'btn very_small' do
= link_to dashboard_path do
&larr; To dashboard &larr; To dashboard
&nbsp;
%span.cgray Events and projects are filtered in scope of group
%hr
= render 'shared/no_ssh' = render 'shared/no_ssh'
- if @events.any? - if @events.any?
.content_list= render @events .content_list= render @events
......
...@@ -7,7 +7,8 @@ ...@@ -7,7 +7,8 @@
= link_to "Edit", edit_project_snippet_path(@project, @snippet), class: "btn small right" = link_to "Edit", edit_project_snippet_path(@project, @snippet), class: "btn small right"
%br %br
.file_holder %div
.file_holder
.file_title .file_title
%i.icon-file %i.icon-file
%strong= @snippet.file_name %strong= @snippet.file_name
...@@ -17,4 +18,6 @@ ...@@ -17,4 +18,6 @@
%div{class: current_user.dark_scheme ? "black" : ""} %div{class: current_user.dark_scheme ? "black" : ""}
= raw @snippet.colorize(options: { linenos: 'True'}) = raw @snippet.colorize(options: { linenos: 'True'})
= render "notes/notes_with_form", tid: @snippet.id, tt: "snippet"
%div
= render "notes/notes_with_form", tid: @snippet.id, tt: "snippet"
...@@ -10,6 +10,11 @@ Feature: Dashboard ...@@ -10,6 +10,11 @@ Feature: Dashboard
Then I should see "Shop" project link Then I should see "Shop" project link
Then I should see project "Shop" activity feed Then I should see project "Shop" activity feed
Scenario: I should see groups list
Given I have group with projects
And I visit dashboard page
Then I should see groups list
Scenario: I should see last push widget Scenario: I should see last push widget
Then I should see last push widget Then I should see last push widget
And I click "Create Merge Request" link And I click "Create Merge Request" link
......
Feature: Groups
Background:
Given I sign in as a user
And I have group with projects
Scenario: I should see group dashboard list
When I visit group page
Then I should see projects list
And I should see projects activity feed
class Groups < Spinach::FeatureSteps
include SharedAuthentication
include SharedPaths
When 'I visit group page' do
visit group_path(current_group)
end
Then 'I should see projects list' do
current_user.projects.each do |project|
page.should have_link project.name
end
end
And 'I have group with projects' do
@group = Factory :group
@project = Factory :project, group: @group
@event = Factory :closed_issue_event, project: @project
@project.add_access current_user, :admin
end
And 'I should see projects activity feed' do
page.should have_content 'closed issue'
end
protected
def current_group
@group ||= Group.first
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