BigW Consortium Gitlab

Commit 88d42c2e by Dmitriy Zaporozhets

Replace projects_box with ui-box. Fixed team spinach test

parent e84df44e
......@@ -6,11 +6,8 @@
.side {
@extend .pull-right;
.projects_box, .ui-box {
.ui-box {
margin: 3px;
}
.projects_box {
> .title {
padding: 2px 15px;
}
......
......@@ -12,10 +12,13 @@
- groups.each do |group|
%li
= link_to group_path(id: group.path), class: dom_class(group) do
%strong.well-title= truncate(group.name, length: 35)
%span.pull-right.light
- if group.owner == current_user
%i.icon-wrench
%strong.well-title
= truncate(group.name, length: 35)
%span.arrow
→
%span.last_activity
%strong Owner:
%span= group.owner_name
- if groups.blank?
%li
%h3.nothing_here_message You have no groups yet.
.projects_box
.ui-box
%h5.title
Projects
%small
......
.projects_box
.ui-box
%h5.title
Projects
%small
......
.projects_box
.ui-box
%h5.title
Projects
%small
......
......@@ -11,7 +11,7 @@
.span9
.tab-content
.tab-pane.active#tab-projects
.ui-box
.ui-box.projects-table
%h5.title Projects
%ul.well-list
- @projects.each do |project|
......
......@@ -206,12 +206,8 @@ class Userteams < Spinach::FeatureSteps
visit team_path(team)
end
When 'I click on link "Projects"' do
click_link "Projects"
end
And 'I click link "Assign project to Team"' do
click_link "Assign project to Team"
When 'I click on link "Assign Project"' do
click_link "Assign Project"
end
Then 'I should see form with my own project in avaliable projects list' do
......
......@@ -59,8 +59,7 @@ Feature: UserTeams
Given I have team with projects and members
And I have my own project without teams
And I visit my team page
When I click on link "Projects"
And I click link "Assign project to Team"
When I click on link "Assign Project"
Then I should see form with my own project in avaliable projects list
When I submit form with selected project and max access
Then I should see my own project in team projects list
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