Reading edit

missing updates Signed-of By: Rafael Reggiani Manzo <rr.manzo@gmail.com>

Reading edit
missing updates Signed-of By: Rafael Reggiani Manzo <rr.manzo@gmail.com>
Renan Fichberg · Rafael Manzo
1 parent e5c7fb3b
Showing 10 changed files with 159 additions and 23 deletions Show diff stats
app/controllers/concerns/ownership_authentication.rb
app/controllers/readings_controller.rb
app/views/readings/edit.html.erb
app/views/repositories/edit.html.erb
config/routes.rb
features/reading/edit.feature
features/step_definitions/reading_group_steps.rb
features/step_definitions/reading_steps.rb
spec/controllers/readings_controller_spec.rb
spec/controllers/repositories_controller_spec.rb
@@ -13,20 +13,24 @@ module OwnershipAuthentication
     check_reading_group_ownership(params[:id])
   end
  
+  def reading_owner?
+    check_reading_group_ownership(params[:reading_group_id])
+  end
+
   def check_project_ownership(id)
     if current_user.project_ownerships.find_by_project_id(id).nil?
       respond_to do |format|
         format.html { redirect_to projects_url, notice: "You're not allowed to do this operation" }
-       format.json { head :no_content }
+        format.json { head :no_content }
       end
     end
   end
-  
+
   def check_reading_group_ownership(id)
     if current_user.reading_group_ownerships.find_by_reading_group_id(id).nil?
       respond_to do |format|
-        format.html { redirect_to reading_group_url, notice: "You're not allowed to do this operation" }
-       format.json { head :no_content }
+        format.html { redirect_to reading_group_url(id), notice: "You're not allowed to do this operation" }
+        format.json { head :no_content }
       end
     end
   end
@@ -2,7 +2,8 @@ include OwnershipAuthentication
  
 class ReadingsController < ApplicationController
   before_action :authenticate_user!, except: [:show, :index]
-  # before_action :reading_group_owner?, except: [:show]
+  before_action :set_reading, only: [:show, :edit, :update, :destroy]
+  before_action :reading_owner?, except: [:show]
  
   def new
     @reading_group_id = params[:reading_group_id]
@@ -17,6 +18,11 @@ class ReadingsController &lt; ApplicationController
     end
   end
  
+  # GET /readings/1/edit
+  def edit
+    @reading_group_id = params[:reading_group_id]
+  end
+
   private
  
   # Never trust parameters from the scary internet, only allow the white list through.
@@ -41,4 +47,7 @@ class ReadingsController &lt; ApplicationController
     end
   end
  
+  def set_reading
+    @reading = Reading.find(params[:id].to_i)
+  end
 end
@@ -0,0 +1,8 @@
+<div class="page-header">
+  <h1>Editing Reading</h1>
+</div>
+
+<%= form_for(@reading, :url => reading_group_reading_update_url(@reading_group_id, @reading.id), method: :put) do |f| %>
+  <%= render partial: 'form', locals: {f: f} %>
+  <%= link_to 'Back', reading_group_path(@reading_group_id), class: 'btn btn-default' %>
+<% end %>
 <div class="page-header">
-  <h1>Editing repository</h1>
+  <h1>Editing Repository</h1>
 </div>
  
 <%= form_for(@repository, :url => project_repository_update_url(@project_id, @repository.id), method: :put) do |f| %>
-	<%= render partial: 'form', locals: {f: f} %>
+  <%= render partial: 'form', locals: {f: f} %>
   <%= link_to 'Back', project_path(@project_id), class: 'btn btn-default' %>
 <% end %>
-
@@ -13,7 +13,8 @@ Mezuro::Application.routes.draw do
   end
  
   resources :reading_groups do
-    resources :readings, except: [:index, :show]
+    resources :readings, except: [:index, :show, :update]
+    put '/readings/:id' => 'readings#update', as: :reading_update
   end
  
   #resources :modules
@@ -0,0 +1,47 @@
+Feature: Reading Edit
+  In Order to be able to update my readings info
+  As a regular user
+  I should be able to edit my readings
+
+@kalibro_restart @wip 
+  Scenario: editing a reading successfully
+    Given I am a regular user
+    And I am signed in
+    And I own a sample reading group
+    And I have a sample reading within the sample reading group
+    And I am at the Edit Reading page
+    Then the field "Label" should be filled with "Good"
+    And the field "Grade" should be filled with "10.5"
+    And the field "Color" should be filled with "33dd33"    
+    When I fill the Label field with "Bad"
+    And I press the Save button
+    Then I should see "Bad"
+    And I should see "10.5"
+    And I should see "33dd33"
+
+  @kalibro_restart @wip
+  Scenario: editing a reading with blank fields
+    Given I am a regular user
+    And I am signed in
+    And I own a sample project
+    And I have a sample configuration with native metrics
+    And I have a sample repository within the sample project named "QtCalculator"
+    And I am at repository edit page
+    When I fill the Name field with " "
+    And I fill the Address field with " "
+    And I press the Save button
+    Then I should see "Name can't be blank"
+    And I should see "Address can't be blank"
+
+  @kalibro_restart @wip
+  Scenario: editing a reading with already taken name
+    Given I am a regular user
+    And I am signed in
+    And I own a sample project
+    And I have a sample configuration with native metrics
+    And I have a sample repository within the sample project named "MedSquare"
+    And I have a sample repository within the sample project named "QtCalculator"
+    And I am at repository edit page
+    When I fill the Name field with "MedSquare"
+    And I press the Save button
+    Then I should see "There's already"
 \ No newline at end of file
 require 'kalibro_gem/errors'
  
+Given(/^I own a sample reading group$/) do
+  @reading_group = FactoryGirl.create(:reading_group, {id: nil})
+  FactoryGirl.create(:reading_group_ownership, {user_id: @user.id, reading_group_id: @reading_group.id})
+end
+
 Given(/^I have a sample reading group$/) do
   @reading_group = FactoryGirl.create(:reading_group, {id: nil})
 end
@@ -8,4 +13,3 @@ When(/^I am at the Sample Reading Group page$/) do
   page.should have_content(@reading_group.name)
   page.should have_content(@reading_group.description)
 end
-
@@ -6,3 +6,6 @@ Given(/^I am at the New Reading page$/) do
   visit new_reading_group_reading_url(@reading_group.id)
 end
  
+Given(/^I am at the Edit Reading page$/) do
+  visit edit_reading_group_reading_url(@reading_group.id, @reading.id)
+end
@@ -6,11 +6,26 @@ describe ReadingsController do
   describe 'new' do
     before :each do
       sign_in FactoryGirl.create(:user)
-      get :new, reading_group_id: reading_group.id
     end
  
-    it { should respond_with(:success) }
-    it { should render_template(:new) }
+    context 'when the current user owns the reading group' do
+      before :each do
+        subject.expects(:reading_owner?).returns true
+        get :new, reading_group_id: reading_group.id
+      end
+
+      it { should respond_with(:success) }
+      it { should render_template(:new) }
+    end
+
+    context "when the current user doesn't owns the reading group" do
+      before :each do
+        get :new, reading_group_id: reading_group.id
+      end
+
+      it { should redirect_to(reading_group_url(reading_group.id)) }
+      it { should respond_with(:redirect) }
+    end
   end
  
   describe 'create' do
@@ -21,24 +36,70 @@ describe ReadingsController do
       sign_in FactoryGirl.create(:user)
     end
  
-    context 'with valid fields' do
+    context 'when the current user owns the reading group' do
       before :each do
-        Reading.any_instance.expects(:save).returns(true)
+        subject.expects(:reading_owner?).returns true
+      end
+
+      context 'with valid fields' do
+        before :each do
+          Reading.any_instance.expects(:save).returns(true)
  
-        post :create, reading_group_id: reading_group.id, reading: reading_params
+          post :create, reading_group_id: reading_group.id, reading: reading_params
+        end
+
+        it { should respond_with(:redirect) }
       end
  
-      it { should respond_with(:redirect) }
+      context 'with invalid fields' do
+        before :each do
+          Reading.any_instance.expects(:save).returns(false)
+
+         post :create, reading_group_id: reading_group.id, reading: reading_params
+        end
+
+        it { should render_template(:new) }
+      end
     end
+  end
  
-    context 'with invalid fields' do
-      before :each do
-        Reading.any_instance.expects(:save).returns(false)
+  describe 'edit' do
+    let(:reading) { FactoryGirl.build(:reading) }
  
-        post :create, reading_group_id: reading_group.id, reading: reading_params
+    context 'with an User logged in' do
+      before do
+        sign_in FactoryGirl.create(:user)
       end
  
-      it { should render_template(:new) }
+      context 'when the user owns the reading' do
+        before :each do
+          subject.expects(:reading_owner?).returns true
+          Reading.expects(:find).at_least_once.with(reading.id).returns(reading)
+          get :edit, id: reading.id, reading_group_id: reading_group.id.to_s
+        end
+
+        it { should render_template(:edit) }
+      end
+
+      context 'when the user does not own the reading' do
+        before do
+          Reading.expects(:find).at_least_once.with(reading.id).returns(reading)
+
+          get :edit, id: reading.id, reading_group_id: reading_group.id.to_s
+        end
+
+        it { should redirect_to(reading_group_url(reading_group.id)) }
+        it { should respond_with(:redirect) }
+        it { should set_the_flash[:notice].to("You're not allowed to do this operation") }
+      end
+    end
+
+    context 'with no user logged in' do
+      before :each do
+        get :edit, id: reading.id, reading_group_id: reading_group.id.to_s
+      end
+
+      it { should redirect_to new_user_session_path }
     end
   end
 end
 \ No newline at end of file
@@ -5,7 +5,7 @@ describe RepositoriesController do
  
   describe 'new' do
     before :each do
-      sign_in FactoryGirl.create(:user)
+      sign_in FactoryGirl.create(:user) #TODO create a context when there's no user logged in
     end
  
     context 'when the current user owns the project' do
...	...	@@ -13,20 +13,24 @@ module OwnershipAuthentication
13	13	check_reading_group_ownership(params[:id])
14	14	end
15	15
	16	+ def reading_owner?
	17	+ check_reading_group_ownership(params[:reading_group_id])
	18	+ end
	19	+
16	20	def check_project_ownership(id)
17	21	if current_user.project_ownerships.find_by_project_id(id).nil?
18	22	respond_to do \|format\|
19	23	format.html { redirect_to projects_url, notice: "You're not allowed to do this operation" }
20		- format.json { head :no_content }
	24	+ format.json { head :no_content }
21	25	end
22	26	end
23	27	end
24		-
	28	+
25	29	def check_reading_group_ownership(id)
26	30	if current_user.reading_group_ownerships.find_by_reading_group_id(id).nil?
27	31	respond_to do \|format\|
28		- format.html { redirect_to reading_group_url, notice: "You're not allowed to do this operation" }
29		- format.json { head :no_content }
	32	+ format.html { redirect_to reading_group_url(id), notice: "You're not allowed to do this operation" }
	33	+ format.json { head :no_content }
30	34	end
31	35	end
32	36	end
...	...
...	...	@@ -2,7 +2,8 @@ include OwnershipAuthentication
2	2
3	3	class ReadingsController < ApplicationController
4	4	before_action :authenticate_user!, except: [:show, :index]
5		- # before_action :reading_group_owner?, except: [:show]
	5	+ before_action :set_reading, only: [:show, :edit, :update, :destroy]
	6	+ before_action :reading_owner?, except: [:show]
6	7
7	8	def new
8	9	@reading_group_id = params[:reading_group_id]
...	...	@@ -17,6 +18,11 @@ class ReadingsController < ApplicationController
17	18	end
18	19	end
19	20
	21	+ # GET /readings/1/edit
	22	+ def edit
	23	+ @reading_group_id = params[:reading_group_id]
	24	+ end
	25	+
20	26	private
21	27
22	28	# Never trust parameters from the scary internet, only allow the white list through.
...	...	@@ -41,4 +47,7 @@ class ReadingsController < ApplicationController
41	47	end
42	48	end
43	49
	50	+ def set_reading
	51	+ @reading = Reading.find(params[:id].to_i)
	52	+ end
44	53	end
...	...
...	...	@@ -0,0 +1,8 @@
	1	+<div class="page-header">
	2	+ <h1>Editing Reading</h1>
	3	+</div>
	4	+
	5	+<%= form_for(@reading, :url => reading_group_reading_update_url(@reading_group_id, @reading.id), method: :put) do \|f\| %>
	6	+ <%= render partial: 'form', locals: {f: f} %>
	7	+ <%= link_to 'Back', reading_group_path(@reading_group_id), class: 'btn btn-default' %>
	8	+<% end %>
...	...
1	1	<div class="page-header">
2		- <h1>Editing repository</h1>
	2	+ <h1>Editing Repository</h1>
3	3	</div>
4	4
5	5	<%= form_for(@repository, :url => project_repository_update_url(@project_id, @repository.id), method: :put) do \|f\| %>
6		- <%= render partial: 'form', locals: {f: f} %>
	6	+ <%= render partial: 'form', locals: {f: f} %>
7	7	<%= link_to 'Back', project_path(@project_id), class: 'btn btn-default' %>
8	8	<% end %>
9		-
...	...
...	...	@@ -13,7 +13,8 @@ Mezuro::Application.routes.draw do
13	13	end
14	14
15	15	resources :reading_groups do
16		- resources :readings, except: [:index, :show]
	16	+ resources :readings, except: [:index, :show, :update]
	17	+ put '/readings/:id' => 'readings#update', as: :reading_update
17	18	end
18	19
19	20	#resources :modules
...	...
...	...	@@ -0,0 +1,47 @@
	1	+Feature: Reading Edit
	2	+ In Order to be able to update my readings info
	3	+ As a regular user
	4	+ I should be able to edit my readings
	5	+
	6	+@kalibro_restart @wip
	7	+ Scenario: editing a reading successfully
	8	+ Given I am a regular user
	9	+ And I am signed in
	10	+ And I own a sample reading group
	11	+ And I have a sample reading within the sample reading group
	12	+ And I am at the Edit Reading page
	13	+ Then the field "Label" should be filled with "Good"
	14	+ And the field "Grade" should be filled with "10.5"
	15	+ And the field "Color" should be filled with "33dd33"
	16	+ When I fill the Label field with "Bad"
	17	+ And I press the Save button
	18	+ Then I should see "Bad"
	19	+ And I should see "10.5"
	20	+ And I should see "33dd33"
	21	+
	22	+ @kalibro_restart @wip
	23	+ Scenario: editing a reading with blank fields
	24	+ Given I am a regular user
	25	+ And I am signed in
	26	+ And I own a sample project
	27	+ And I have a sample configuration with native metrics
	28	+ And I have a sample repository within the sample project named "QtCalculator"
	29	+ And I am at repository edit page
	30	+ When I fill the Name field with " "
	31	+ And I fill the Address field with " "
	32	+ And I press the Save button
	33	+ Then I should see "Name can't be blank"
	34	+ And I should see "Address can't be blank"
	35	+
	36	+ @kalibro_restart @wip
	37	+ Scenario: editing a reading with already taken name
	38	+ Given I am a regular user
	39	+ And I am signed in
	40	+ And I own a sample project
	41	+ And I have a sample configuration with native metrics
	42	+ And I have a sample repository within the sample project named "MedSquare"
	43	+ And I have a sample repository within the sample project named "QtCalculator"
	44	+ And I am at repository edit page
	45	+ When I fill the Name field with "MedSquare"
	46	+ And I press the Save button
	47	+ Then I should see "There's already"
0	48	\ No newline at end of file
...	...
1	1	require 'kalibro_gem/errors'
2	2
	3	+Given(/^I own a sample reading group$/) do
	4	+ @reading_group = FactoryGirl.create(:reading_group, {id: nil})
	5	+ FactoryGirl.create(:reading_group_ownership, {user_id: @user.id, reading_group_id: @reading_group.id})
	6	+end
	7	+
3	8	Given(/^I have a sample reading group$/) do
4	9	@reading_group = FactoryGirl.create(:reading_group, {id: nil})
5	10	end
...	...	@@ -8,4 +13,3 @@ When(/^I am at the Sample Reading Group page$/) do
8	13	page.should have_content(@reading_group.name)
9	14	page.should have_content(@reading_group.description)
10	15	end
11		-
...	...
...	...	@@ -6,3 +6,6 @@ Given(/^I am at the New Reading page$/) do
6	6	visit new_reading_group_reading_url(@reading_group.id)
7	7	end
8	8
	9	+Given(/^I am at the Edit Reading page$/) do
	10	+ visit edit_reading_group_reading_url(@reading_group.id, @reading.id)
	11	+end
...	...
...	...	@@ -6,11 +6,26 @@ describe ReadingsController do
6	6	describe 'new' do
7	7	before :each do
8	8	sign_in FactoryGirl.create(:user)
9		- get :new, reading_group_id: reading_group.id
10	9	end
11	10
12		- it { should respond_with(:success) }
13		- it { should render_template(:new) }
	11	+ context 'when the current user owns the reading group' do
	12	+ before :each do
	13	+ subject.expects(:reading_owner?).returns true
	14	+ get :new, reading_group_id: reading_group.id
	15	+ end
	16	+
	17	+ it { should respond_with(:success) }
	18	+ it { should render_template(:new) }
	19	+ end
	20	+
	21	+ context "when the current user doesn't owns the reading group" do
	22	+ before :each do
	23	+ get :new, reading_group_id: reading_group.id
	24	+ end
	25	+
	26	+ it { should redirect_to(reading_group_url(reading_group.id)) }
	27	+ it { should respond_with(:redirect) }
	28	+ end
14	29	end
15	30
16	31	describe 'create' do
...	...	@@ -21,24 +36,70 @@ describe ReadingsController do
21	36	sign_in FactoryGirl.create(:user)
22	37	end
23	38
24		- context 'with valid fields' do
	39	+ context 'when the current user owns the reading group' do
25	40	before :each do
26		- Reading.any_instance.expects(:save).returns(true)
	41	+ subject.expects(:reading_owner?).returns true
	42	+ end
	43	+
	44	+ context 'with valid fields' do
	45	+ before :each do
	46	+ Reading.any_instance.expects(:save).returns(true)
27	47
28		- post :create, reading_group_id: reading_group.id, reading: reading_params
	48	+ post :create, reading_group_id: reading_group.id, reading: reading_params
	49	+ end
	50	+
	51	+ it { should respond_with(:redirect) }
29	52	end
30	53
31		- it { should respond_with(:redirect) }
	54	+ context 'with invalid fields' do
	55	+ before :each do
	56	+ Reading.any_instance.expects(:save).returns(false)
	57	+
	58	+ post :create, reading_group_id: reading_group.id, reading: reading_params
	59	+ end
	60	+
	61	+ it { should render_template(:new) }
	62	+ end
32	63	end
	64	+ end
33	65
34		- context 'with invalid fields' do
35		- before :each do
36		- Reading.any_instance.expects(:save).returns(false)
	66	+ describe 'edit' do
	67	+ let(:reading) { FactoryGirl.build(:reading) }
37	68
38		- post :create, reading_group_id: reading_group.id, reading: reading_params
	69	+ context 'with an User logged in' do
	70	+ before do
	71	+ sign_in FactoryGirl.create(:user)
39	72	end
40	73
41		- it { should render_template(:new) }
	74	+ context 'when the user owns the reading' do
	75	+ before :each do
	76	+ subject.expects(:reading_owner?).returns true
	77	+ Reading.expects(:find).at_least_once.with(reading.id).returns(reading)
	78	+ get :edit, id: reading.id, reading_group_id: reading_group.id.to_s
	79	+ end
	80	+
	81	+ it { should render_template(:edit) }
	82	+ end
	83	+
	84	+ context 'when the user does not own the reading' do
	85	+ before do
	86	+ Reading.expects(:find).at_least_once.with(reading.id).returns(reading)
	87	+
	88	+ get :edit, id: reading.id, reading_group_id: reading_group.id.to_s
	89	+ end
	90	+
	91	+ it { should redirect_to(reading_group_url(reading_group.id)) }
	92	+ it { should respond_with(:redirect) }
	93	+ it { should set_the_flash[:notice].to("You're not allowed to do this operation") }
	94	+ end
	95	+ end
	96	+
	97	+ context 'with no user logged in' do
	98	+ before :each do
	99	+ get :edit, id: reading.id, reading_group_id: reading_group.id.to_s
	100	+ end
	101	+
	102	+ it { should redirect_to new_user_session_path }
42	103	end
43	104	end
44	105	end
45	106	\ No newline at end of file
...	...
...	...	@@ -5,7 +5,7 @@ describe RepositoriesController do
5	5
6	6	describe 'new' do
7	7	before :each do
8		- sign_in FactoryGirl.create(:user)
	8	+ sign_in FactoryGirl.create(:user) #TODO create a context when there's no user logged in
9	9	end
10	10
11	11	context 'when the current user owns the project' do
...	...