User projects list

Rafael Manzo
1 parent 841edc19
Showing 10 changed files with 82 additions and 56 deletions Show diff stats
app/views/layouts/application.html.erb
app/views/projects/index.html.erb
app/views/shared/_project_list.html.erb
app/views/users/projects.html.erb
features/homepage.feature
features/step_definitions/user_steps.rb
features/step_definitions/user_update_steps.rb
features/user_update.feature
features/users/user_projects.feature
features/users/user_update.feature
@@ -80,6 +80,7 @@
               <% if user_signed_in? %>
                 <li class="nav-header">User info</li>
                 <li>Hello, <strong><%= current_user.name %></strong></li>
+                <li><%= link_to 'My projects', user_projects_path(current_user.id) %></li>
               <% end %>
               <% if content_for?(:sidebar) %>
                 <%= yield :sidebar %>
@@ -4,27 +4,4 @@
 <p><% if user_signed_in? %><%= link_to 'New Project', new_project_path, class: 'btn  btn-primary' %><% end %></p>
-<table class="table table-hover">
-  <thead>
-    <tr>
-      <th>Name</th>
-      <th>Description</th>
-      <th colspan="2"></th>
-    </tr>
-  </thead>
-
-  <tbody>
-    <% @projects.each do |project| %>
-      <tr>
-        <td><%= project.name %></td>
-        <td><%= project.description %></td>
-        <td><%= link_to 'Show', project_path(project.id), class: 'btn btn-info' %></td>
-        <td>
-          <% if project_owner? project.id %>
-            <%= link_to 'Edit', edit_project_path(project.id), class: 'btn btn-info' %>
-          <% end %>
-        </td>
-      </tr>
-    <% end %>
-  </tbody>
-</table>
+<%= render partial: 'shared/project_list', locals: {projects: @projects} %>
@@ -0,0 +1,24 @@
+<table class="table table-hover">
+  <thead>
+    <tr>
+      <th>Name</th>
+      <th>Description</th>
+      <th colspan="2"></th>
+    </tr>
+  </thead>
+
+  <tbody>
+    <% projects.each do |project| %>
+      <tr>
+        <td><%= project.name %></td>
+        <td><%= project.description %></td>
+        <td><%= link_to 'Show', project_path(project.id), class: 'btn btn-info' %></td>
+        <td>
+          <% if project_owner? project.id %>
+            <%= link_to 'Edit', edit_project_path(project.id), class: 'btn btn-info' %>
+          <% end %>
+        </td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>
 \ No newline at end of file
@@ -0,0 +1,5 @@
+<div class="page-header">
+  <h1><%= @user.name %> Projects</h1>
+</div>
+
+<%= render partial: 'shared/project_list', locals: {projects: @user.projects} %>
 \ No newline at end of file
@@ -17,4 +17,5 @@ Feature: Homepage
     Then I should see "Edit"
     And I should see "Logout"
     And I should see "Latest projects"
-    And I should see "Project"
 \ No newline at end of file
+    And I should see "Project"
+    And I should see "My projects"
 \ No newline at end of file
@@ -0,0 +1,20 @@
+When(/^I click the (.+) link$/) do |text|
+  click_link text
+end
+
+When(/^I press the (.+) button$/) do |text|
+  click_button text
+end
+
+When(/^I fill the (.+) field with "(.+)"$/) do |field, text|
+  fill_in field, :with => text
+end
+
+Then(/^my name should have changed to (.+)$/) do |text|
+  @user.reload
+  @user.name.should eq(text)
+end
+
+Then(/^I should be in the User Projects page$/) do
+  page.should have_content("#{@user.name} Projects")
+end
 \ No newline at end of file
@@ -1,16 +0,0 @@
-When(/^I click the (.+) link$/) do |text|
-  click_link text
-end
-
-When(/^I press the (.+) button$/) do |text|
-  click_button text
-end
-
-When(/^I fill the (.+) field with "(.+)"$/) do |field, text|
-  fill_in field, :with => text
-end
-
-Then(/^my name should have changed to (.+)$/) do |text|
-  @user.reload
-  @user.name.should eq(text)
-end
 \ No newline at end of file
@@ -1,15 +0,0 @@
-Feature: User update
-  In Order to be able to update my name
-  As a regular user
-  I want to have an edit page
-
-  Scenario: with current password
-    Given I am a regular user
-    And I am signed in
-    And I am at the homepage
-    When I click the Edit link
-    And I fill the Name field with "Rafael Manzo"
-    And I fill the Current password field with "password"
-    And I press the Update button
-    Then I should see "You updated your account successfully"
-    And my name should have changed to Rafael Manzo
 \ No newline at end of file
@@ -0,0 +1,14 @@
+Feature: User projects list
+  In Order to be able to easily find my projects
+  As a regular user
+  I want to have a page with a list of my projects
+
+  @kalibro_restart
+  Scenario: with current password
+    Given I am a regular user
+    And I own a sample project
+    And I am signed in
+    And I am at the homepage
+    When I click the My projects link
+    Then I should be in the User Projects page
+    And the sample project should be there
 \ No newline at end of file
@@ -0,0 +1,15 @@
+Feature: User update
+  In Order to be able to update my name
+  As a regular user
+  I want to have an edit page
+
+  Scenario: with current password
+    Given I am a regular user
+    And I am signed in
+    And I am at the homepage
+    When I click the Edit link
+    And I fill the Name field with "Rafael Manzo"
+    And I fill the Current password field with "password"
+    And I press the Update button
+    Then I should see "You updated your account successfully"
+    And my name should have changed to Rafael Manzo
 \ No newline at end of file
	@@ -4,27 +4,4 @@		@@ -4,27 +4,4 @@
4		4
5	<p><% if user_signed_in? %><%= link_to 'New Project', new_project_path, class: 'btn btn-primary' %><% end %></p>	5	<p><% if user_signed_in? %><%= link_to 'New Project', new_project_path, class: 'btn btn-primary' %><% end %></p>
6		6
7	-<table class="table table-hover">
8	- <thead>
9	- <tr>
10	- <th>Name</th>
11	- <th>Description</th>
12	- <th colspan="2"></th>
13	- </tr>
14	- </thead>
15	-
16	- <tbody>
17	- <% @projects.each do \|project\| %>
18	- <tr>
19	- <td><%= project.name %></td>
20	- <td><%= project.description %></td>
21	- <td><%= link_to 'Show', project_path(project.id), class: 'btn btn-info' %></td>
22	- <td>
23	- <% if project_owner? project.id %>
24	- <%= link_to 'Edit', edit_project_path(project.id), class: 'btn btn-info' %>
25	- <% end %>
26	- </td>
27	- </tr>
28	- <% end %>
29	- </tbody>
30	-</table>	7	+<%= render partial: 'shared/project_list', locals: {projects: @projects} %>
	@@ -0,0 +1,24 @@		@@ -0,0 +1,24 @@
		1	+<table class="table table-hover">
		2	+ <thead>
		3	+ <tr>
		4	+ <th>Name</th>
		5	+ <th>Description</th>
		6	+ <th colspan="2"></th>
		7	+ </tr>
		8	+ </thead>
		9	+
		10	+ <tbody>
		11	+ <% projects.each do \|project\| %>
		12	+ <tr>
		13	+ <td><%= project.name %></td>
		14	+ <td><%= project.description %></td>
		15	+ <td><%= link_to 'Show', project_path(project.id), class: 'btn btn-info' %></td>
		16	+ <td>
		17	+ <% if project_owner? project.id %>
		18	+ <%= link_to 'Edit', edit_project_path(project.id), class: 'btn btn-info' %>
		19	+ <% end %>
		20	+ </td>
		21	+ </tr>
		22	+ <% end %>
		23	+ </tbody>
		24	+</table>
0	\ No newline at end of file	25	\ No newline at end of file
	@@ -0,0 +1,5 @@		@@ -0,0 +1,5 @@
		1	+<div class="page-header">
		2	+ <h1><%= @user.name %> Projects</h1>
		3	+</div>
		4	+
		5	+<%= render partial: 'shared/project_list', locals: {projects: @user.projects} %>
0	\ No newline at end of file	6	\ No newline at end of file
	@@ -0,0 +1,20 @@		@@ -0,0 +1,20 @@
		1	+When(/^I click the (.+) link$/) do \|text\|
		2	+ click_link text
		3	+end
		4	+
		5	+When(/^I press the (.+) button$/) do \|text\|
		6	+ click_button text
		7	+end
		8	+
		9	+When(/^I fill the (.+) field with "(.+)"$/) do \|field, text\|
		10	+ fill_in field, :with => text
		11	+end
		12	+
		13	+Then(/^my name should have changed to (.+)$/) do \|text\|
		14	+ @user.reload
		15	+ @user.name.should eq(text)
		16	+end
		17	+
		18	+Then(/^I should be in the User Projects page$/) do
		19	+ page.should have_content("#{@user.name} Projects")
		20	+end
0	\ No newline at end of file	21	\ No newline at end of file
	@@ -1,16 +0,0 @@		@@ -1,16 +0,0 @@
1	-When(/^I click the (.+) link$/) do \|text\|
2	- click_link text
3	-end
4	-
5	-When(/^I press the (.+) button$/) do \|text\|
6	- click_button text
7	-end
8	-
9	-When(/^I fill the (.+) field with "(.+)"$/) do \|field, text\|
10	- fill_in field, :with => text
11	-end
12	-
13	-Then(/^my name should have changed to (.+)$/) do \|text\|
14	- @user.reload
15	- @user.name.should eq(text)
16	-end
17	\ No newline at end of file	0	\ No newline at end of file
	@@ -1,15 +0,0 @@		@@ -1,15 +0,0 @@
1	-Feature: User update
2	- In Order to be able to update my name
3	- As a regular user
4	- I want to have an edit page
5	-
6	- Scenario: with current password
7	- Given I am a regular user
8	- And I am signed in
9	- And I am at the homepage
10	- When I click the Edit link
11	- And I fill the Name field with "Rafael Manzo"
12	- And I fill the Current password field with "password"
13	- And I press the Update button
14	- Then I should see "You updated your account successfully"
15	- And my name should have changed to Rafael Manzo
16	\ No newline at end of file	0	\ No newline at end of file
	@@ -0,0 +1,14 @@		@@ -0,0 +1,14 @@
		1	+Feature: User projects list
		2	+ In Order to be able to easily find my projects
		3	+ As a regular user
		4	+ I want to have a page with a list of my projects
		5	+
		6	+ @kalibro_restart
		7	+ Scenario: with current password
		8	+ Given I am a regular user
		9	+ And I own a sample project
		10	+ And I am signed in
		11	+ And I am at the homepage
		12	+ When I click the My projects link
		13	+ Then I should be in the User Projects page
		14	+ And the sample project should be there
0	\ No newline at end of file	15	\ No newline at end of file
	@@ -0,0 +1,15 @@		@@ -0,0 +1,15 @@
		1	+Feature: User update
		2	+ In Order to be able to update my name
		3	+ As a regular user
		4	+ I want to have an edit page
		5	+
		6	+ Scenario: with current password
		7	+ Given I am a regular user
		8	+ And I am signed in
		9	+ And I am at the homepage
		10	+ When I click the Edit link
		11	+ And I fill the Name field with "Rafael Manzo"
		12	+ And I fill the Current password field with "password"
		13	+ And I press the Update button
		14	+ Then I should see "You updated your account successfully"
		15	+ And my name should have changed to Rafael Manzo
0	\ No newline at end of file	16	\ No newline at end of file