Commit 88d42c2e authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Replace projects_box with ui-box. Fixed team spinach test

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