adherent 0.3.4 → 0.3.5

data/spec/controllers/adherent/members_controller_spec.rb

@@ -2,12 +2,18 @@
 
 require 'rails_helper'
 
+RSpec.configure do |c|
+  # c.exclusion_filter = {js:true} 
+  # c.filter = {wip:true}
+end
+
 describe Adherent::MembersController, :type => :controller do
   
+  fixtures ['organisms', 'adherent/members'] 
+  
   before(:each) do
-   @routes = Adherent::Engine.routes 
+    @routes = Adherent::Engine.routes 
   end
-    
   
   describe "GET index" do
         
@@ -18,7 +24,7 @@ describe Adherent::MembersController, :type => :controller do
     
 
     it "assigns all members as @members" do
-      expect(Adherent::QueryMember).to receive(:query_members).and_return([1,2])
+      expect(Adherent::Member).to receive(:query_members).and_return([1,2])
       get :index
       expect(assigns(:members)).to eq([1,2])
     end
@@ -33,15 +39,10 @@ describe Adherent::MembersController, :type => :controller do
   end
   
   describe "GET show" do
-    it 'appelle le membre' do
-      expect(Adherent::Member).to receive(:find).with('999').and_return(double(Adherent::Member))
-      get :show, {id:'999'}
-    end
-    
+         
     it 'assigne le membre et rend la vue' do
-      allow(Adherent::Member).to receive(:find).with('998').and_return(@m = double(Adherent::Member))
-      get :show, {id:'998'}
-      expect(assigns[:member]).to eq(@m)
+      get :show, {id:adherent_members(:Durand).to_param}
+      expect(assigns[:member]).to eq(adherent_members(:Durand))
       expect(response).to render_template('show')
     end
   end
@@ -57,15 +58,11 @@ describe Adherent::MembersController, :type => :controller do
   end
   
   describe "GET edit" do
-    it 'appelle le membre' do
-      expect(Adherent::Member).to receive(:find).with('999').and_return(double(Adherent::Member))
-      get :edit, {id:'999'}
-    end
     
+        
     it 'assigne le membre et rend la vue' do
-      allow(Adherent::Member).to receive(:find).with('998').and_return(@m = double(Adherent::Member))
-      get :edit, {id:'998'}
-      expect(assigns[:member]).to eq(@m)
+      get :edit, {id:adherent_members(:Durand).to_param}
+      expect(assigns[:member]).to eq(adherent_members(:Durand))
       expect(response).to render_template('edit')
     end
   end
@@ -73,10 +70,10 @@ describe Adherent::MembersController, :type => :controller do
   describe "POST create" do
     
     before(:each) do
-      @attrib = {name:'Dupont', forname:'Jules', number:'A001'}
+      @attrib = {name:'Dupont', forname:'Jules', number:'A55'}
     end
     
-    it 'redirige vers index en cas de succès' do
+    it 'redirige vers la saisie des coordonnées en cas de succès' do
       post :create,  :member=>@attrib
       expect(response).to redirect_to(new_member_coord_url(assigns[:member]))
     end
@@ -91,7 +88,7 @@ describe Adherent::MembersController, :type => :controller do
       post :create,  :member=>@attrib
       expect(assigns[:member].name).to eq('Dupont')
       expect(assigns[:member].forname).to eq('Jules')
-      expect(assigns[:member].number).to eq('A001')
+      expect(assigns[:member].number).to eq('A55')
     end
     
     it 'on peut enregistrer une date' do
@@ -107,31 +104,23 @@ describe Adherent::MembersController, :type => :controller do
   describe "POST update" do
     
     before(:each) do
-      @member = Adherent::Member.new(name:'Dupont',forname:'Jules', number:'A002')
-      @member.organism_id = 1
-      puts @member.errors.messages unless @member.valid?
-      @member.save
-      allow(Adherent::Member).to receive(:find).with(@member.to_param).
-        and_return @member
+      @member = adherent_members(:Dupont)
     end
-    
-    
-    
+        
     it 'appelle update_attributes' do
-      expect(@member).to receive(:update_attributes).with({'name'=>'Dalton'}).and_return true
       post :update, {id:@member.to_param, :member=>{:name=>'Dalton'} }
+      expect(@member.reload.name).to eq 'Dalton'
     end
     
     it 'redirige vers show en cas de succès' do
-     # allow(@member).to receive(:update_attributes).and_return true
+      # allow(@member).to receive(:update_attributes).and_return true
       post :update, {id:@member.to_param, :member=>{:name=>'Dalton'} }
       expect(response).to redirect_to(member_url(@member))
     end
     
     it 'et vers la vue edit autrement' do
-      allow(@member).to receive(:update_attributes).and_return false
-      post :update,  {id:@member.to_param, :member=>{:name=>'Dalton'} }
-      expect(response).to render_template 'edit'
+      post :update,  {id:@member.to_param, :member=>{:number=>'A002'} }
+      expect(response).to render_template 'edit' 
     end
     
     it 'la variable @member est assignée' do
@@ -141,22 +130,20 @@ describe Adherent::MembersController, :type => :controller do
     end
   end
 
-  describe "DELETE destroy" do
+  describe "DELETE destroy"  do
     
     before(:each) do
-      @member = double(Adherent::Member)
+      @member = adherent_members(:Dupont)
+      @nb_members = Adherent::Member.count
     end
     
-   it 'trouve le member demandé' do
-      allow(@member).to receive(:destroy)
-      expect(Adherent::Member).to receive(:find).with(@member.to_param).and_return @member
-     
-     delete :destroy, {:id=>@member.to_param}
-   end
+    it 'détruit le member demandé' do
+      delete :destroy, {:id=>@member.to_param}
+      expect(Adherent::Member.count).to eq(@nb_members-1)
+      expect {Adherent::Member.find(1)}.to raise_error(ActiveRecord::RecordNotFound)
+    end
    
-    it 'le détruit et le redirige vers la vue index' do
-      allow(Adherent::Member).to receive(:find).with(@member.to_param).and_return @member
-      expect(@member).to receive(:destroy).and_return true 
+    it 'et redirige vers la vue index' do
       delete :destroy, {:id=>@member.to_param}
       expect(response).to redirect_to members_url
     end

data/spec/controllers/adherent/payments_controller_spec.rb

@@ -4,28 +4,25 @@ require 'rails_helper'
 
 describe Adherent::PaymentsController, :type => :controller do
   
+  fixtures :all
+  
   before(:each) do
     @routes = Adherent::Engine.routes
-    @member = double(Adherent::Member)
-    allow(Adherent::Member).to receive(:find).with(@member.to_param).and_return @member
+    @member = adherent_members(:Dupont)
     allow(@controller).to receive(:guess_date).and_return Date.today
   end
     
   
   describe "GET index" do
-    
+        
     it 'rend la vue index' do
-      allow(@member).to receive(:payments)
       get :index, member_id:@member.to_param
       expect(response).to render_template("index")
     end
-    
 
     it "assigns all coords as @coords" do
-      expect(@member).to receive(:payments).and_return [1,2]
       get :index, member_id:@member.to_param
-      expect(assigns(:payments)).to eq([1,2])
-  
+      expect(assigns(:payments)).to eq(@member.payments)  
     end
   end
   
@@ -34,12 +31,9 @@ describe Adherent::PaymentsController, :type => :controller do
   describe 'GET new' do 
     
     it 'assigne un payments et rend la vue new' do
-      
-      expect(@member).to receive(:payments).and_return(@ar = double(Arel))
-      expect(@member).to receive(:unpaid_amount).and_return 57
-      expect(@ar).to receive(:new).with(date:Date.today, amount:57).and_return(@pay = double(Adherent::Payment))
       get :new, member_id:@member.to_param
-      expect(assigns[:payment]).to eq(@pay)
+      expect(assigns[:payment]).to be_a_new(Adherent::Payment)
+      expect(assigns[:payment].member_id).to eq @member.id
       expect(response).to render_template('new') 
     end
     
@@ -53,40 +47,33 @@ describe Adherent::PaymentsController, :type => :controller do
     end
     
     it 'crée une nouvelle adhésion avec les params' do
-      expect(@member).to receive(:payments).and_return(@ar = double(Arel)) 
-      expect(@ar).to receive(:new).with(@attrib).and_return(@pay = double(Adherent::Payment))
-      expect(@pay).to receive(:save).and_return true
-      post :create, {member_id:@member.to_param, :payment=>@attrib}
+      expect {
+      post :create, {member_id:@member.to_param, :payment=>@attrib} }.
+      to change {Adherent::Payment.count}.by 1
       
     end
     
     it 'renvoie vers la vue des adhésions' do
-      allow(@member).to receive(:payments).and_return(@ar = double(Arel))
-      allow(@ar).to receive(:new).and_return(@pay = double(Adherent::Payment))
-      allow(@pay).to receive(:save).and_return true
       post :create, {member_id:@member.to_param, :payment=>@attrib}
-      expect(response).to redirect_to(member_payments_url(assigns[:member]))
+      expect(response).to redirect_to(member_payments_url(@member))
     end
     
     it 'et vers la vue new autrement' do
-      allow(@member).to receive(:payments).and_return(@ar = double(Arel))
-      allow(@ar).to receive(:new).and_return(@pay = double(Adherent::Payment))
-      allow(@pay).to receive(:save).and_return false
-      post :create, {member_id:@member.to_param, :payment=>@attrib}
+      post :create, {member_id:@member.to_param,
+        :payment=>{'mode'=>'CB', 'date'=>I18n.l(Date.today) } }
       expect(response).to render_template('new')
     end
     
        
   end
   
-  describe "GET show" do  
+  describe "GET show"  do  
     
     it 'rend la vue show' do
-      @pay = double(Adherent::Payment)
-      expect(@member).to receive(:payments).and_return(@ar = double(Arel))
-      expect(@ar).to receive(:find_by_id).with(@pay.to_param).and_return @pay
-      get :show, member_id:@member.to_param , id:@pay.to_param
-      expect(assigns[:payment]).to eq(@pay)
+      m = adherent_members(:Fidele)  
+      pay = adherent_payments(:pay_2) 
+      get :show, member_id:m.to_param , id:pay.to_param
+      expect(assigns[:payment]).to eq(pay)
       expect(response).to render_template('show') 
     end
   end