adherent 0.2.8 → 0.2.9

data/spec/dummy/tmp/pids/server.pid

@@ -0,0 +1 @@
+8455

data/spec/features/js_spec.rb

@@ -44,7 +44,7 @@ describe 'javascript requests', :type => :feature do
       alert = page.driver.browser.switch_to.alert
       alert.accept
       sleep 1
-      expect(Adherent::Member.count).to eq(4)
+      expect(Adherent::Member.count).to eq(4) 
     end
   end
   

data/spec/models/adherent/query_member_spec.rb

@@ -15,6 +15,8 @@ describe Adherent::QueryMember, :type => :model do
       birthdate:Date.civil(1955,6,6)}
   end
   
+  let(:org) {double(Organism, id:1)}
+  
   before(:each) do
     @m = Adherent::Member.new(valid_attributes) 
     @m.organism_id = 1
@@ -29,11 +31,11 @@ describe Adherent::QueryMember, :type => :model do
   end
   
   it 'on peut initier un query_member' do
-    expect(Adherent::QueryMember.count).to eq(1) 
+    expect(Adherent::QueryMember.query_members(org).size).to eq(1) 
   end
   
   it 'dont les champs sont corrects' do
-    m = Adherent::QueryMember.first
+    m = Adherent::QueryMember.query_members(org).first
     expect(m.birthdate).to eq('06/06/1955')
     expect(m.name).to eq(@m.name)
     expect(m.forname).to eq(@m.forname)
@@ -53,7 +55,7 @@ describe Adherent::QueryMember, :type => :model do
     end
      
     it 'donne la bonne fin d adhésion' do
-      m = Adherent::QueryMember.first
+      m = Adherent::QueryMember.query_members(org).first
       expect(m.m_to_date).to eq(I18n::l((Date.today.beginning_of_year>>2) -1)) 
     end
      
@@ -75,7 +77,7 @@ describe Adherent::QueryMember, :type => :model do
       end
       
       it 'le membre doit encore 14.26 ' do
-        m = Adherent::QueryMember.first
+        m = Adherent::QueryMember.query_members(org).first
         expect(m.t_reglements).to eq(8)
         expect(m.t_adhesions).to eq(22.26)
         expect(m.montant_du).to eq(14.26) 
@@ -85,7 +87,7 @@ describe Adherent::QueryMember, :type => :model do
         @p = @m.payments.new(date:Date.today, amount:10.26, mode:'CB')
         allow(@p).to receive(:correct_range_date).and_return true 
         @p.save
-        m = Adherent::QueryMember.first
+        m = Adherent::QueryMember.query_members(org).first
         expect(m.montant_du).to eq(4) 
         expect(m.a_jour?).to be false
       end
@@ -96,7 +98,7 @@ describe Adherent::QueryMember, :type => :model do
         allow(@p).to receive(:correct_range_date).and_return true 
         allow(@q).to receive(:correct_range_date).and_return true 
         @p.save; @q.save
-        m = Adherent::QueryMember.first
+        m = Adherent::QueryMember.query_members(org).first
         expect(m.montant_du).to eq(0) 
         expect(m.a_jour?).to be true
       end
@@ -107,7 +109,7 @@ describe Adherent::QueryMember, :type => :model do
         allow(@p).to receive(:correct_range_date).and_return true 
       
         @p.save
-        m = Adherent::QueryMember.first
+        m = Adherent::QueryMember.query_members(org).first
         expect(m.montant_du).to eq(0) 
         expect(m.a_jour?).to be true
       end
@@ -116,40 +118,48 @@ describe Adherent::QueryMember, :type => :model do
     end
      
      
+    describe 'export' do
+      
+      def two_lines
+        [Adherent::QueryMember.new(number:'Adh 001', name:'Dupont', forname:'Jules',
+            birthdate:Date.civil(1955,6,6), mail:'bonjour@example.com', 
+            tel:'01.02.03.04.05', t_adhesions:22.26, t_reglements:0,
+            m_to_date:((Date.today.beginning_of_year >> 2) -1))
+        ]
+      end  
+    
   
-  
-    describe 'to_csv' do
+      describe 'to_csv' do
     
-      before(:each) do
-        @organism =  double(Organism, id:1)
-        allow(Adherent::QueryMember).to receive(:query_members).with(@organism).
-          and_return(Adherent::QueryMember.all)
-        csv = Adherent::QueryMember.to_csv(@organism)
-        @lignes = csv.split("\n")
-      end
-      it 'la ligne de titre' do
-        expect(@lignes[0]).to eq("Numero\tNom\tPrénom\tDate de naissance\tMail\tTél\tDoit\tFin Adh.")
-      end
+        before(:each) do
+          @organism =  double(Organism, id:1)
+          allow(Adherent::QueryMember).to receive(:query_members).with(@organism).
+            and_return(two_lines)
+          csv = Adherent::QueryMember.to_csv(@organism)
+          @lignes = csv.split("\n")
+        end
+        it 'la ligne de titre' do
+          expect(@lignes[0]).to eq("Numero\tNom\tPrénom\tDate de naissance\tMail\tTél\tDoit\tFin Adh.")
+        end
       
-      it 'une ligne de valeurs' do
-        expect(@lignes[1]).to eq("Adh 001\tDupont\tJules\t06/06/1955\tbonjour@example.com\t01.02.03.04.05\t22,26\t#{I18n::l((Date.today.beginning_of_year>>2) -1)}")
+        it 'une ligne de valeurs' do
+          expect(@lignes[1]).to eq("Adh 001\tDupont\tJules\t06/06/1955\tbonjour@example.com\t01.02.03.04.05\t22,26\t#{I18n::l((Date.today.beginning_of_year>>2) -1)}")
+        end
+       
       end
-      
-      
-    end
     
-    describe 'to_xls' do
-      before(:each) do
-        @organism =  double(Organism, id:1)
-        allow(Adherent::QueryMember).to receive(:query_members).with(@organism).
-          and_return(Adherent::QueryMember.all)
-      end
+      describe 'to_xls' do
+        before(:each) do
+          @organism =  double(Organism, id:1)
+          allow(Adherent::QueryMember).to receive(:query_members).with(@organism).
+            and_return(two_lines)
+        end
       
-      it 'to_xls doit marcher également' do
-        expect {Adherent::QueryMember.to_xls(@organism)}.not_to raise_error
+        it 'to_xls doit marcher également' do
+          expect {Adherent::QueryMember.to_xls(@organism)}.not_to raise_error
+        end
       end
     end
-  
   end
   
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: adherent
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors:
 - Jean-Claude Lepage
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-16 00:00:00.000000000 Z
+date: 2015-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets-rails
@@ -356,6 +356,7 @@ files:
 - app/assets/javascripts/adherent/application.js
 - app/assets/javascripts/adherent/common.js
 - app/assets/javascripts/adherent/coords.js
+- app/assets/javascripts/adherent/datatableinit.js
 - app/assets/javascripts/adherent/date_picker.js
 - app/assets/javascripts/adherent/jquery.dataTables.min.js
 - app/assets/javascripts/adherent/members.js
@@ -743,6 +744,7 @@ files:
 - spec/dummy/tmp/cache/assets/development/sprockets/0c418a7e3c6101ef6e3c008f3e550abe
 - spec/dummy/tmp/cache/assets/development/sprockets/0cf09b6bd4058afb7797d332f36bdd68
 - spec/dummy/tmp/cache/assets/development/sprockets/0d14e869566ca526fbdbbbc488475003
+- spec/dummy/tmp/cache/assets/development/sprockets/0d215f323ff7a120168496bc58ed75a3
 - spec/dummy/tmp/cache/assets/development/sprockets/0ea4d583ba95e0c1eb3b926932571034
 - spec/dummy/tmp/cache/assets/development/sprockets/0eacb9cfe91deee88befb653c4ca2953
 - spec/dummy/tmp/cache/assets/development/sprockets/0ec565b2aab8a3ae9211952ed56f1a70
@@ -914,6 +916,7 @@ files:
 - spec/dummy/tmp/cache/assets/development/sprockets/8c382a2a9aab338b046cc3fe6d47f435
 - spec/dummy/tmp/cache/assets/development/sprockets/8c5ffb42727c5fc7794ac3c608b17c2e
 - spec/dummy/tmp/cache/assets/development/sprockets/8d46886219801353094d82d2e0b36f73
+- spec/dummy/tmp/cache/assets/development/sprockets/8e3cd5dcbc6987a1bab580133dd4091a
 - spec/dummy/tmp/cache/assets/development/sprockets/8ea4f850c201e8912b42b4bc3e997211
 - spec/dummy/tmp/cache/assets/development/sprockets/8f1b44c5518c8e16b2b9636ec6ea9c5b
 - spec/dummy/tmp/cache/assets/development/sprockets/8f27ca529693572686fb951ba66e32e9
@@ -932,6 +935,7 @@ files:
 - spec/dummy/tmp/cache/assets/development/sprockets/97829b155233b6d466bc829fff627287
 - spec/dummy/tmp/cache/assets/development/sprockets/97f59d5e32c82d6c6f80530dd59eb1e5
 - spec/dummy/tmp/cache/assets/development/sprockets/9909959901922ff5ee27206a9e56a99d
+- spec/dummy/tmp/cache/assets/development/sprockets/992d715e0153da278420d380aa63b412
 - spec/dummy/tmp/cache/assets/development/sprockets/9a6548b678d621a1b9f0f9f27f130113
 - spec/dummy/tmp/cache/assets/development/sprockets/9b29bbccf28796fd330aa7ad92d137e1
 - spec/dummy/tmp/cache/assets/development/sprockets/9b410af44867a4979d1aea0ab84ed24b
@@ -1304,6 +1308,7 @@ files:
 - spec/dummy/tmp/cache/assets/test/sprockets/8a7a27749f2f76175627ed4084e5ae1b
 - spec/dummy/tmp/cache/assets/test/sprockets/8c382a2a9aab338b046cc3fe6d47f435
 - spec/dummy/tmp/cache/assets/test/sprockets/8c5ffb42727c5fc7794ac3c608b17c2e
+- spec/dummy/tmp/cache/assets/test/sprockets/8e3cd5dcbc6987a1bab580133dd4091a
 - spec/dummy/tmp/cache/assets/test/sprockets/8ea4f850c201e8912b42b4bc3e997211
 - spec/dummy/tmp/cache/assets/test/sprockets/8f1b44c5518c8e16b2b9636ec6ea9c5b
 - spec/dummy/tmp/cache/assets/test/sprockets/8f27ca529693572686fb951ba66e32e9
@@ -1317,6 +1322,7 @@ files:
 - spec/dummy/tmp/cache/assets/test/sprockets/97227c6149cc49c443da470997965485
 - spec/dummy/tmp/cache/assets/test/sprockets/973acbad728af4334804dd0454045384
 - spec/dummy/tmp/cache/assets/test/sprockets/97f59d5e32c82d6c6f80530dd59eb1e5
+- spec/dummy/tmp/cache/assets/test/sprockets/992d715e0153da278420d380aa63b412
 - spec/dummy/tmp/cache/assets/test/sprockets/9b29bbccf28796fd330aa7ad92d137e1
 - spec/dummy/tmp/cache/assets/test/sprockets/9b410af44867a4979d1aea0ab84ed24b
 - spec/dummy/tmp/cache/assets/test/sprockets/9b6859af21d7d645ed13281e6419d6dc
@@ -1432,6 +1438,7 @@ files:
 - spec/dummy/tmp/cache/assets/test/sprockets/fd147c53711773ad70daed13844ec1a4
 - spec/dummy/tmp/cache/assets/test/sprockets/fe43817b9966fa56e9620ebda600f772
 - spec/dummy/tmp/cache/assets/test/sprockets/fef07c3c165353f861564ede180350a4
+- spec/dummy/tmp/pids/server.pid
 - spec/features/adhesions_spec.rb
 - spec/features/coord_spec.rb
 - spec/features/js_spec.rb
@@ -1500,6 +1507,7 @@ test_files:
 - spec/dummy/log/test.log
 - spec/dummy/log/development.log
 - spec/dummy/Rakefile
+- spec/dummy/tmp/pids/server.pid
 - spec/dummy/tmp/cache/assets/test/sass/154e667a92d917d35bbad2bca4a67a18286e6047/_variables.scssc
 - spec/dummy/tmp/cache/assets/test/sass/154e667a92d917d35bbad2bca4a67a18286e6047/_modals.scssc
 - spec/dummy/tmp/cache/assets/test/sass/154e667a92d917d35bbad2bca4a67a18286e6047/_carousel.scssc
@@ -1614,6 +1622,7 @@ test_files:
 - spec/dummy/tmp/cache/assets/test/sprockets/a6007699da6bc59ddab5019f88a59065
 - spec/dummy/tmp/cache/assets/test/sprockets/f543d5b5c05af915f4a31b6df4388aeb
 - spec/dummy/tmp/cache/assets/test/sprockets/9b29bbccf28796fd330aa7ad92d137e1
+- spec/dummy/tmp/cache/assets/test/sprockets/8e3cd5dcbc6987a1bab580133dd4091a
 - spec/dummy/tmp/cache/assets/test/sprockets/6b4a271890f37338b02a9febc97c3daf
 - spec/dummy/tmp/cache/assets/test/sprockets/0701319e027b68d87b4d5727aa571973
 - spec/dummy/tmp/cache/assets/test/sprockets/cb476833cd1a806e251da407a58d9520
@@ -1775,6 +1784,7 @@ test_files:
 - spec/dummy/tmp/cache/assets/test/sprockets/aac72c81c4f00133234e7d1bb46d7925
 - spec/dummy/tmp/cache/assets/test/sprockets/4dd3fce32a54a0f8fb029c30f41d3487
 - spec/dummy/tmp/cache/assets/test/sprockets/c55e2bbc3d3c5566893be021ec1c4ab7
+- spec/dummy/tmp/cache/assets/test/sprockets/992d715e0153da278420d380aa63b412
 - spec/dummy/tmp/cache/assets/test/sprockets/c571cb715531b81b6777b57546a06732
 - spec/dummy/tmp/cache/assets/test/sprockets/34a4093120a5fc0daec9697570a14cac
 - spec/dummy/tmp/cache/assets/test/sprockets/d27d4e6bd84d0108fc54a21959181335
@@ -1955,6 +1965,7 @@ test_files:
 - spec/dummy/tmp/cache/assets/development/sprockets/df7e1e4d508705c77a96e8deb9d8cf4a
 - spec/dummy/tmp/cache/assets/development/sprockets/f543d5b5c05af915f4a31b6df4388aeb
 - spec/dummy/tmp/cache/assets/development/sprockets/9b29bbccf28796fd330aa7ad92d137e1
+- spec/dummy/tmp/cache/assets/development/sprockets/8e3cd5dcbc6987a1bab580133dd4091a
 - spec/dummy/tmp/cache/assets/development/sprockets/6b4a271890f37338b02a9febc97c3daf
 - spec/dummy/tmp/cache/assets/development/sprockets/0701319e027b68d87b4d5727aa571973
 - spec/dummy/tmp/cache/assets/development/sprockets/cb476833cd1a806e251da407a58d9520
@@ -2207,6 +2218,7 @@ test_files:
 - spec/dummy/tmp/cache/assets/development/sprockets/e9d3b4c4c90f3be7d3d0abf681e6beb5
 - spec/dummy/tmp/cache/assets/development/sprockets/9edbcadf5d7bd3710cf93d08d9c78cf0
 - spec/dummy/tmp/cache/assets/development/sprockets/c55e2bbc3d3c5566893be021ec1c4ab7
+- spec/dummy/tmp/cache/assets/development/sprockets/992d715e0153da278420d380aa63b412
 - spec/dummy/tmp/cache/assets/development/sprockets/c571cb715531b81b6777b57546a06732
 - spec/dummy/tmp/cache/assets/development/sprockets/0d14e869566ca526fbdbbbc488475003
 - spec/dummy/tmp/cache/assets/development/sprockets/34a4093120a5fc0daec9697570a14cac
@@ -2273,6 +2285,7 @@ test_files:
 - spec/dummy/tmp/cache/assets/development/sprockets/35ef41173b6f56b97a04b40f0fc1b293
 - spec/dummy/tmp/cache/assets/development/sprockets/4f67efffc5aea8afd7ea072c6ba8712f
 - spec/dummy/tmp/cache/assets/development/sprockets/b08442ed09e0d665d1f3e3218bf6b95a
+- spec/dummy/tmp/cache/assets/development/sprockets/0d215f323ff7a120168496bc58ed75a3
 - spec/dummy/tmp/cache/assets/development/sprockets/08e67f9b24a565ccbd1124ef05e6a592
 - spec/dummy/tmp/cache/assets/development/sprockets/a82b177f6dddc824750d4f4a75668d9a
 - spec/dummy/tmp/cache/assets/development/sprockets/67537e49bc9ad096d402c7ca903180c4