adherent 0.3.4 → 0.3.5

data/spec/models/adherent/member_spec.rb

@@ -3,186 +3,238 @@
 require 'rails_helper'
 
 RSpec.configure do |c|
- # c.exclusion_filter = {js:true}
- # c.filter = {wip:true}
+  # c.exclusion_filter = {js:true}
+  # c.filter = {wip:true}
 end
 
-
 describe Adherent::Member, :type => :model do
+  fixtures :all
   
   def valid_attributes
-    {name:'Dupont', forname:'Jules', number:'Adh 001'}
+    {name:'Dupont', forname:'Jules', number:'Adh 001', organism_id:1}
   end
   
   describe 'validation' do
     it 'valid_attributes est valide' do
       m = Adherent::Member.new(valid_attributes)
-      m.organism_id = 1
       expect(m).to be_valid
     end
     
     it 'invalide sans nom' do
-      va = valid_attributes
-      va.delete(:name)
-      m = Adherent::Member.new(va)
-      m.organism_id = 1
+      m = adherent_members(:Dupont)
+      m.name = nil
       expect(m).not_to be_valid
     end
     
     it 'invalide sans prenom' do
-      va = valid_attributes
-      va.delete(:forname)
-      m = Adherent::Member.new(va)
-      m.organism_id = 1
+      m = adherent_members(:Dupont)
+      m.forname = nil
       expect(m).not_to be_valid
     end
     
     it 'invalide sans numéro' do
-      va = valid_attributes
-      va.delete(:number)
-      m = Adherent::Member.new(va)
-      m.organism_id = 1
+      m = adherent_members(:Dupont)
+      m.number = nil
+      expect(m).not_to be_valid
+    end
+    
+    it 'invalide si numero existe déja pour cet organisme' do
+      m = Adherent::Member.new(name:'Dupont', forname:'Alain', organism_id:1, 
+        number:adherent_members(:Dupont).number)
       expect(m).not_to be_valid
     end
     
+    it 'mais valide pour un autre organisme' do
+      m = Adherent::Member.new(name:'Dupont', forname:'Alain', organism_id:2, 
+        number:adherent_members(:Dupont).number)
+      expect(m).to be_valid
+    end
+    
     describe 'test de birthdate' do
-      before(:each) do
-        @m = Adherent::Member.new(valid_attributes)
-        @m.organism_id = 1
-      end
-      
       it 'on peut rentrer une date de naissance' do
-        @m.birthdate = '06/06/1944'
-        @m.save
-        expect(@m.read_attribute(:birthdate)).to eq(Date.civil(1944,6,6))
+        m = adherent_members(:Durand)
+        m.birthdate = '06/06/1944'
+        m.save
+        expect(m.read_attribute(:birthdate)).to eq(Date.civil(1944,6,6))
       end
       
-      
     end
-    
-    describe 'le numéro est unique' do
-      before(:each) do
-        @m = Adherent::Member.new(valid_attributes)
-        @m.organism_id = 1
-        @m.save!
-      end
-      
-      it 'on ne peut créer un autre adhérent avec la même référence' do
-        m = Adherent::Member.new(name:'Buck', forname:'Charles', number:'Adh 001')
-        m.organism_id = 1
-        expect(m).not_to be_valid
-      end
-      
-      it 'mais on peut si organisme différent' do
-        m = Adherent::Member.new(name:'Buck', forname:'Charles', number:'Adh 001')
-        m.organism_id = 2
-        expect(m).to be_valid
-      end
-      
       
-    end
-    
   end 
   
   describe 'méthodes' do
-    
-    before(:each) do
-      @m = Adherent::Member.new(valid_attributes)
-      @m.organism_id = 1
-    end
-    
+       
     it 'to s renvoie le nom et le prénom' do
-      expect(@m.to_s).to eq('Jules DUPONT')
+      expect(adherent_members(:Dupont).to_s).to eq('Jules DUPONT')
     end
     
     describe 'next_adhesion' do
+      context 'un membre qui n en a pas encore' do
+        
+        subject {adherent_members(:Durand)}
       
-      it 'next_adhesion renvoie une adhésion relevant de ce membre' do
-        expect(@m.next_adhesion).to be_an_instance_of(Adherent::Adhesion)
-      end
+        it 'next_adhesion renvoie une adhésion relevant de ce membre' do
+          expect(subject.next_adhesion).to be_an_instance_of(Adherent::Adhesion)
+        end
       
-      it 'avec 0 comme montant' do
-        expect(@m.next_adhesion.amount).to eq(0)
-      end
+        it 'avec 0 comme montant' do
+          expect(subject.next_adhesion.amount).to eq(0)
+        end
+      
+        it 'mais on peut fournir un montant' do
+          @na = subject.next_adhesion(25)
+          expect(@na.amount).to eq(25)
+        end
       
-      it 'mais on peut fournir un montant' do
-        @na = @m.next_adhesion(25)
-        expect(@na.amount).to eq(25)
       end
       
-      context 'avec déjà une adhésion' do
+      context 'un membre avec déjà une adhésion' do
         
-        before(:each) do
-          @m.save!
-          @m.next_adhesion(26.66).save!
-          
-        end
+        subject {adherent_members(:Dupont)}
         
         it 'next_adhesion renvoie une adhésion' do
-          expect(@m.next_adhesion).to be_an_instance_of(Adherent::Adhesion)
+          expect(subject.next_adhesion).to be_an_instance_of(Adherent::Adhesion)
         end
         
         it 'dont le montant est identique au précédent'do
-          expect(@m.next_adhesion.amount).to eq(26.66)
+          expect(subject.next_adhesion.amount).to eq(26.66)
         end
         
         it 'mais on peut surcharger' do
-          expect(@m.next_adhesion(44).amount).to eq(44)
+          expect(subject.next_adhesion(44).amount).to eq(44)
         end
         
-        
       end
     
     end
     
     describe 'les adhésions impayées' do
       
-      before(:each) do
-        allow(@m).to receive(:adhesions).and_return @ar=double(Arel)
-        allow(@ar).to receive(:order).with(:to_date).and_return(@ar)
-        allow(@ar).to receive(:unpaid).and_return([double(:due=>12), double(:due=>27)])          
-      end
+      subject {adherent_members(:Dupont)}
       
       it 'le membre a des adhésions non payées' do
-        expect(@m).to be_unpaid_adhesions
+        expect(subject).to be_unpaid_adhesions
       end
-      
           
       it 'pour un montant total de 39' do
-        expect(@m.unpaid_amount).to eq(39)
+        expect(subject.unpaid_amount).to eq(26.66)
       end
       
-      
-      
     end
     
     describe 'jusquau' do
       
       context 'sans adhésion' do
         
+        subject {adherent_members(:Durand)}
+        
         it 'renvoie inconnu' do
-          allow(@m).to receive(:last_adhesion).and_return nil
-          allow(@m).to receive(:created_at).and_return Time.now
-          expect(@m.jusquau).to eq(I18n::l(Date.today))
+          expect(subject.jusquau).to eq(I18n::l subject.created_at.to_date)
         end
         
       end
       
       context 'avec adhésion' do
+        subject {adherent_members(:Dupont)}
+        
         it 'renvoie la date de fin cette adhésion' do
-          allow(@m).to receive(:last_adhesion).
-            and_return double(Adherent::Adhesion, to_date:Date.today)
-          expect(@m.jusquau).to eq(Date.today)
+          expect(subject.jusquau).to eq I18n::l(Date.today.years_since(1) -1)
         end
         
       end
       
+    end
+    
+    describe 'query_members' do
+      subject {adherent_members(:Fidele)}
+        
+      before(:each) do
+        subject.build_coord(tel:'01.02.03.04.05', mail:'bonjour@example.com') 
+        subject.save!
+      end
+        
+      it 'query_member' do
+        expect(Adherent::Member.query_members(organisms(:asso)).size).to eq(3) 
+      end 
+      
+      it 'peut créer un csv' do
+        expect {Adherent::Member.to_csv(organisms(:asso))}.to_not raise_error
+      end
       
+      it 'qui possède une ligne de titre' do
+        csv  = Adherent::Member.to_csv(organisms(:asso))
+        expect(csv.split("\n").first).
+          to eq  "Numero\tNom\tPrénom\tDate de naissance\tMail\tTél\tGsm\tBureau\tAdresse\tCode Postal\tVille\tDoit\tFin Adh."
+      end
       
+      it 'qui possède une ligne des lignes adhérents' do
+        csv  = Adherent::Member.to_csv(organisms(:asso))
+        fidele = csv.split("\n").select {|l| 'Fidele'.in? l}.first
+        expect(fidele). 
+          to eq "A003\tFidele\tChe\t\tbonjour@example.com\t01.02.03.04.05\t\t\t\t\t\t50,00\t#{(Date.today.years_since(2) -1)}"
+      end
+   
+      context 'avec deux adhésions' do
+        
+        subject {adherent_members(:Fidele)}
+      
+        it 'donne la bonne fin d adhésion' do
+          expect(subject.jusquau).to eq I18n::l((Date.today.years_since(2)) -1)
+        end
+     
+        context 'avec des règlements'  do
+          # Fidele est un membre avec deux adhésions de 25 € chacune
+       
+          before(:each) do
+            @p = subject.payments.new(date:Date.today, amount:8, mode:'CB')
+            allow(@p).to receive(:correct_range_date).and_return true 
+            @p.save
+           end
+      
+          it 'le membre doit encore 14.26 ' do
+            ms = Adherent::Member.query_members(organisms(:asso))
+            m = ms.select {|a| a.number == subject.number}.first 
+            expect(m.t_reglements).to eq(8)
+            expect(m.t_adhesions).to eq(50)
+            expect(m.montant_du).to eq(42) 
+          end
+      
+          it 'après un paiement de 10.50 €, il doit encore 31,50' do
+            @p = subject.payments.new(date:Date.today, amount:10.50, mode:'CB')
+            allow(@p).to receive(:correct_range_date).and_return true 
+            @p.save
+            ms = Adherent::Member.query_members(organisms(:asso))
+            m = ms.select {|a| a.number == subject.number}.first 
+            expect(m.montant_du).to eq(31.50) 
+            expect(m.a_jour?).to be false
+          end
+      
+          it 'avec de paiements, l un de 20,50, l autre de 21,50 € il ne doit plus rien' do
+            @p = subject.payments.new(date:Date.today, amount:20.50, mode:'CB')
+            @q = subject.payments.new(date:Date.today, amount:21.50, mode:'CB')
+            allow(@p).to receive(:correct_range_date).and_return true 
+            allow(@q).to receive(:correct_range_date).and_return true 
+            @p.save; @q.save
+            ms = Adherent::Member.query_members(organisms(:asso))
+            m = ms.select {|a| a.number == subject.number}.first 
+            expect(m.montant_du).to eq(0) 
+            expect(m.a_jour?).to be true
+          end
+      
+          it 's il paye plus il ne doit rien non plus' do
+            @p = subject.payments.new(date:Date.today, amount:60, mode:'CB')
+            allow(@p).to receive(:correct_range_date).and_return true 
+            @p.save
+            ms = Adherent::Member.query_members(organisms(:asso))
+            m = ms.select {|a| a.number == subject.number}.first 
+            expect(m.montant_du).to eq(0) 
+            expect(m.a_jour?).to be true
+          end
+      
+        end
+      end
     end
-    
   end
-   
 end
 
 

data/spec/models/adherent/payment_spec.rb

@@ -1,27 +1,19 @@
 # coding utf-8
 
 require 'rails_helper'
-require 'support/fixtures'
+ 
 
 RSpec.configure do |c| 
   # c.filter = {:wip=>true}
 end
 
 describe 'Payment', :type => :model do 
-  include Fixtures
+  fixtures :all
   
-  def new_payment  
-    @pay = Adherent::Payment.new(amount:111, mode:'CB', date:Date.today)
-    @pay.member_id = 1
-    allow(@pay).to receive(:member).and_return(@ar = double(Arel))
-    allow(@ar).to receive(:organism).and_return(Organism.new)
-    @pay
-  end
- 
   describe 'validations' do 
     
     before(:each) do
-      new_payment
+      @pay = adherent_payments(:pay_1) 
     end
     
     it 'new_payment est valide' , wip:true do
@@ -57,137 +49,66 @@ describe 'Payment', :type => :model do
   describe 'imputation after create' do
     
     before(:each) do 
-      create_members(1)
-      @member = @members.first
-      @member.adhesions.create(:from_date=>Date.today, :to_date=>Date.today.months_since(1), amount:27 )
-      @member.next_adhesion.save
-      allow(@member).to receive(:organism).and_return(Organism.new)
+      @member = adherent_members(:Fidele)
     end
     
-    it 'enregistrer un payement crée 2 règlements' do
-      @member.payments.create(:amount=>54, date:Date.today, mode:'CB')
-      expect(Adherent::Reglement.count).to eq(2)
-    end
-    
-    it 'ne crée qu un règlement si le montant est insuffisant' do
-      @member.payments.create(:amount=>25, date:Date.today, mode:'CB')
-      expect(Adherent::Reglement.count).to eq(1)
+    it 'enregistrer un payement crée 1 règlement' do
+      expect{@member.payments.create(:amount=>54, date:Date.today, mode:'CB')}.
+        to change {Adherent::Reglement.count}.by 2 # car Fidele a 2 adhesions
     end
     
     it 'sait calculer le montant restant à imputer si plus que suffisant' do
-      pay = @member.payments.create(:amount=>60, date:Date.today, mode:'CB')
-      expect(pay.non_impute).to eq(6)
+      pay = @member.payments.create(:amount=>54, date:Date.today, mode:'CB')
+      expect(pay.non_impute).to eq(4)
     end
     
     it 'un paiement hors date ajoute une erreur' do
-      p = @member.payments.new(:amount=>25, date:Date.today << 5, mode:'CB')
-      p.save 
+      p = @member.payments.create(:amount=>25, date:Date.today << 5, mode:'CB')
       expect(p.errors.messages[:date]).to eq(['hors limite'])
     end
     
     it 'et n\'est pas sauvé' do
       p = @member.payments.new(:amount=>25, date:Date.today << 5, mode:'CB')
       expect {p.save}.not_to change {Adherent::Payment.count}
-      
     end
     
-    
   end
   
   
-  describe 'Imputation on adh'  do
+  describe 'Imputation on adh' do
     
     # soit un paiement et une adhésion, lorsqu'on impute le paiement
     # sur cette adhésion, il est créé un réglement pour le montant adapté, 
     # soit la totalité de l'adhésion si le non imputé est supérieur
     # soit le montant non imputé si le non imputé est inférieur
     before(:each) do
-      @m = create_members(1).first # on créé un member
-      @p = create_payment(@m) # un payement de 50€ par défaut
+      @p = adherent_payments(:pay_1) # un paiement de 15 €
+      @m = @p.member # le membre Dupont
+      @a = @m.adhesions.first # avec une adhésion de 26.66
     end
     
-    after(:each) do
-      Adherent::Adhesion.delete_all
-    end
-    
-    it 'avec un adhésion de 50' do
-      @a = Adherent::Adhesion.create!(member_id:@m.id, amount:50,
-        from_date:Date.today, to_date:(Date.today.years_since(1)))
+    it 'avec un paiement du montant de l adhésion' do
+      @p.amount = 26.66; @p.save
       @p.imputation_on_adh(@a.id)
       expect(@p.non_impute).to eq 0
       expect(@a).to be_is_paid
     end
     
-    it 'avec un adhésion de 60' do
-      @a = Adherent::Adhesion.create!(member_id:@m.id, amount:60,
-        from_date:Date.today, to_date:(Date.today.years_since(1)))
+    it 'avec un paiement inférieur à l adhésion'  do
       @p.imputation_on_adh(@a.id)
       expect(@p.non_impute).to eq 0
       expect(@a).not_to be_is_paid
-      expect(@a.due).to eq 10
+      expect(@a.due).to eq 11.66
     end
     
-    it 'avec un adhésion de 60' do
-      @a = Adherent::Adhesion.create!(member_id:@m.id, amount:40,
-        from_date:Date.today, to_date:(Date.today.years_since(1)))
+    it 'avec un paiement supérieur à l adhésion' do
+      @p.amount = 36.66; @p.save
       @p.imputation_on_adh(@a.id)
       expect(@p.non_impute).to eq 10
       expect(@a).to be_is_paid
       expect(@a.due).to eq 0
     end
     
-    
-  end
-  
-  describe 'list_imputations', wip:true do
-    
-    # la liste des imputations donne un Array d'information sur les 
-    # règlements associés à un paiement, array construit avec la méthode
-    # member.to_s.
-    # La méthode ne doit pas créer d'erreur même si l'adhésion ou le membre
-    # n'existe plus
-    before(:each) do
-      @m = create_members(1).first # on créé un member
-      @p = create_payment(@m) # un payement de 50€ par défaut
-    end
-    
-    after(:each) do
-      Adherent::Adhesion.delete_all
-    end
-    
-    it 'avec une seule imputation' do
-      @a = Adherent::Adhesion.create!(member_id:@m.id, amount:50,
-        from_date:Date.today, to_date:(Date.today.years_since(1)))
-      @p.imputation_on_adh(@a.id)
-      @p.reglements(true)
-      expect(@p.list_imputations).to eq [member:@m.to_s, amount:50, r_id:@p.reglements.first.id]
-    end
-    
-    it 'avec deux imputations' do
-      @a = Adherent::Adhesion.create!(member_id:@m.id, amount:10,
-        from_date:Date.today, to_date:(Date.today.years_since(1)))
-      @p.imputation_on_adh(@a.id)
-      @a2 = Adherent::Adhesion.create!(member_id:@m.id, amount:10,
-        from_date:Date.today, to_date:(Date.today.years_since(1)))
-      @p.imputation_on_adh(@a2.id)
-      @p.reglements(true)
-      expect(@p.list_imputations).
-        to eq([{member:@m.to_s, amount:10, r_id:@p.reglements.first.id},
-          {member:@m.to_s, amount:10, r_id:@p.reglements.last.id}])
-    end
-    
-    it 'avec un adhérent effacé, affiche Adhésion inconnue' do
-       @a = Adherent::Adhesion.create!(member_id:@m.id, amount:50,
-        from_date:Date.today, to_date:(Date.today.years_since(1)))
-      @p.imputation_on_adh(@a.id)
-      @p.reglements(true)
-      @a.delete
-      expect(@p.list_imputations).
-        to eq [{member:'Inconnue', amount:50, r_id:@p.reglements.first.id}]
-    end
-    
-    
-    
   end
   
 end  

data/spec/models/adherent/reglement_spec.rb

@@ -3,7 +3,7 @@
 require 'rails_helper'
 
 describe 'Règlement', :type => :model do
-  include Fixtures
+  
   
   describe 'validations' do
     

data/spec/rails_helper.rb

@@ -18,7 +18,8 @@ Dir[Rails.root.join("spec/support/**/*.rb")].each { |f| require f }
 
 RSpec.configure do |config|
   # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
-  # config.fixture_path = "#{::Rails.root}/spec/fixtures"
+  config.fixture_path = "#{::Rails.root}/spec/fixtures"
+  
 
   # If you're not using ActiveRecord, or you'd prefer not to run each of your
   # examples within a transaction, remove the following line or assign false

data/spec/spec_helper.rb

@@ -80,3 +80,4 @@ RSpec.configure do |config|
   
 
 end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adherent
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Jean-Claude Lepage
@@ -479,7 +479,6 @@ files:
 - app/models/adherent/coord.rb
 - app/models/adherent/member.rb
 - app/models/adherent/payment.rb
-- app/models/adherent/query_member.rb
 - app/models/adherent/reglement.rb
 - app/models/organism.rb
 - app/views/adherent/adhesions/_form.html.haml
@@ -1068,11 +1067,9 @@ files:
 - spec/models/adherent/coord_spec.rb
 - spec/models/adherent/member_spec.rb
 - spec/models/adherent/payment_spec.rb
-- spec/models/adherent/query_member_spec.rb
 - spec/models/adherent/reglement_spec.rb
 - spec/rails_helper.rb
 - spec/spec_helper.rb
-- spec/support/fixtures.rb
 - spec/views/adherent/allpayments/index.html.erb_spec.rb
 - spec/views/adherent/payments/new.html.haml_spec.rb
 homepage: http://faiteslescomptes.fr
@@ -1100,7 +1097,6 @@ signing_key:
 specification_version: 4
 summary: Gestion des adhérents d'une association
 test_files:
-- spec/models/adherent/query_member_spec.rb
 - spec/models/adherent/adhesion_spec.rb
 - spec/models/adherent/reglement_spec.rb
 - spec/models/adherent/member_spec.rb
@@ -1627,7 +1623,6 @@ test_files:
 - spec/controllers/adherent/reglements_controller_spec.rb
 - spec/controllers/adherent/payments_controller_spec.rb
 - spec/controllers/adherent/adhesions_controller_spec.rb
-- spec/support/fixtures.rb
 - spec/helpers/adherent/allpayments_helper_spec.rb
 - spec/features/reglements_spec.rb
 - spec/features/js_spec.rb