adherent 0.1.0 → 0.1.1

data/test/fixtures/adherent/adhesions.yml

@@ -2,10 +2,12 @@
 
 one:
   from_date: 2013-08-06
-  to_date: 2013-08-06
-  member_id: 
+  to_date: 2013-09-05
+  amount: 8
+  member_id: <%= ActiveRecord::Fixtures.identify(:jcl) %> 
 
 two:
-  from_date: 2013-08-06
-  to_date: 2013-08-06
-  member_id: 
+  from_date: 2013-09-06
+  to_date: 2014-08-05
+  amount: 125.23
+  member_id: <%= ActiveRecord::Fixtures.identify(:jcl) %> 

data/test/fixtures/adherent/coords.yml

@@ -8,7 +8,7 @@ one:
   address: MyText
   zip: MyString
   city: MyString
-  member: one
+  member_id: <%= ActiveRecord::Fixtures.identify(:jcl) %>
 
 two:
   mail: MyString
@@ -18,4 +18,4 @@ two:
   address: MyText
   zip: MyString
   city: MyString
-  member: two
+  member_id: <%= ActiveRecord::Fixtures.identify(:jul) %>

data/test/fixtures/adherent/members.yml

@@ -1,13 +1,13 @@
 # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/Fixtures.html
 
-one:
+jcl:
   number: '001'
   name: Lepage
   forname: Jean Claude
   birthdate: 1955-06-06
 
-two:
+jul:
   number: '002'
-  name: Lepage
-  forname: Annie
+  name: Dupont
+  forname: Jules
   birthdate: 1952-06-15

data/test/fixtures/adherent/payments.yml

@@ -4,19 +4,16 @@ one:
   date: '08/08/2013'
   amount: 9.99
   mode: Chèque
-  adhesion: 
-  member: 
+  member_id: <%= ActiveRecord::Fixtures.identify(:jcl) %> 
 
 two:
   date: '08/08/2013'
   amount: -9.99
   mode: CB
-  adhesion: 
-  member: 
+  member_id: 
     
 invalid_mode:
   date: '08/08/2013'
   amount: 9.99
   mode: Dessous de table
-  adhesion: 
-  member: 
+  member_id: <%= ActiveRecord::Fixtures.identify(:jcl) %> 

data/test/functional/adherent/adhesions_controller_test.rb

@@ -0,0 +1,32 @@
+require 'test_helper'
+
+module Adherent
+  class AdhesionsControllerTest < ActionController::TestCase
+    setup do
+      @member = adherent_members(:jcl)
+      @adhesion = adherent_adhesions(:one)
+      @valid_attr = {}
+    end
+    
+    test "should get index" do
+      get :index, {member_id:@member.id}, use_route: :adherent
+      assert_response :success
+    end
+  
+    test "should get edit" do
+      get :edit, {member_id:@member.id, id:@adhesion.to_param}, use_route: :adherent
+      assert_response :success
+    end
+  
+    test "should get new" do
+      get :new, {member_id:@member.id},  use_route: :adherent
+      assert_response :success
+    end
+  
+    test "should get show" do
+      get :show,{member_id:@member.id, id:@adhesion.to_param}, use_route: :adherent
+      assert_response :success
+    end
+  
+  end
+end

data/test/functional/adherent/coords_controller_test.rb

@@ -4,7 +4,7 @@ module Adherent
   class CoordsControllerTest < ActionController::TestCase
     setup do
       @coord = adherent_coords(:one)
-      @member = adherent_members(:one)
+      @member = adherent_members(:jcl)
     end
   
     test "should get index" do
@@ -24,7 +24,7 @@ module Adherent
         post :create, {member_id:@member, coord: { address: @coord.address, city: @coord.city, gsm: @coord.gsm, mail: @coord.mail, office: @coord.office, tel: @coord.tel, zip: @coord.zip }}, use_route: :adherent
       end
   
-      assert_redirected_to member_coord_path(assigns(:member))
+      assert_redirected_to new_member_adhesion_path(assigns(:member))
     end
   
     test "should show coord" do
@@ -39,7 +39,7 @@ module Adherent
   
     test "should update coord" do
       put :update, {member_id:@member, id: @coord, coord: { address: @coord.address, city: @coord.city, gsm: @coord.gsm, mail: @coord.mail, office: @coord.office, tel: @coord.tel, zip: @coord.zip }}, use_route: :adherent
-      assert_redirected_to coord_path(assigns(:coord))
+      assert_redirected_to member_coord_path(assigns(:member))
     end
   
     test "should destroy coord" do

data/test/functional/adherent/members_controller_test.rb

@@ -3,7 +3,8 @@ require 'test_helper'
 module Adherent
   class MembersControllerTest < ActionController::TestCase
     setup do
-      @member = adherent_members(:one)
+      @member = adherent_members(:jcl)
+      @valid_attr = {number:'Adh002', name:'Haddock', forname:'Capitaine'}
     end
   
     test "should get index" do
@@ -19,7 +20,7 @@ module Adherent
   
     test "should create member" do
       assert_difference('Member.count') do
-        post :create, member: { birthdate: @member.birthdate, forname: @member.forname, name: @member.name, number: @member.number },
+        post :create, member: @valid_attr,
            use_route: :adherent
       end
   
@@ -27,20 +28,20 @@ module Adherent
     end
   
     test "should show member" do
-      get :show, id: @member, use_route: :adherent
+      get :show, id: @member.id, use_route: :adherent
       assert_response :success
     end
   
     test "should get edit" do
-      get :edit, id: @member, use_route: :adherent
+      get :edit, id: @member.to_param, use_route: :adherent
       assert_response :success
     end
   
     test "should update member" do
-      put :update, id: @member, 
+      put :update, id: @member.id, 
         member: { birthdate: @member.birthdate, forname: @member.forname, name: @member.name, number: @member.number },
         use_route: :adherent
-      assert_redirected_to member_path(assigns(:member), )
+      assert_redirected_to member_path(@member.id)
     end
   
     test "should destroy member" do

data/test/functional/adherent/payments_controller_test.rb

@@ -2,23 +2,29 @@ require 'test_helper'
 
 module Adherent
   class PaymentsControllerTest < ActionController::TestCase
+    
+    setup do
+      @member = adherent_members(:jcl)
+      @payment =adherent_payments(:one)
+    end
+    
     test "should get index" do
-      get :index
+      get :index, member_id:@member.to_param, use_route: :adherent
       assert_response :success
     end
   
     test "should get new" do
-      get :new
+      get :new, member_id:@member.to_param, use_route: :adherent
       assert_response :success
     end
   
     test "should get edit" do
-      get :edit
+      get :edit, {member_id:@member.to_param, id:@payment.to_param}, use_route: :adherent
       assert_response :success
     end
   
     test "should get show" do
-      get :show
+      get :show, {member_id:@member.to_param, id:@payment.to_param}, use_route: :adherent
       assert_response :success
     end
   

data/test/functional/adherent/reglements_controller_test.rb

@@ -2,20 +2,24 @@ require 'test_helper'
 
 module Adherent
   class ReglementsControllerTest < ActionController::TestCase
-    test "should get index" do
-      get :index
-      assert_response :success
+    setup do
+      @payment = adherent_payments(:one)
+      @adhestion = adherent_adhesions(:one)
     end
   
     test "should get new" do
-      get :new
+      get :new, payment_id:@payment.to_param, use_route: :adherent
       assert_response :success
     end
-  
-    test "should get show" do
-      get :show
-      assert_response :success
+    
+    test "should create" do
+      post :create, { payment_id:@payment.to_param,
+        :reglement=>{:adhesion_id=>@adhestion.id}}, use_route: :adherent
+      
+      assert_redirected_to member_payments_path(@payment.member)
     end
   
+    
+  
   end
 end

data/test/unit/adherent/adhesion_test.rb

@@ -5,7 +5,7 @@ require 'test_helper'
 module Adherent
   class AdhesionTest < ActiveSupport::TestCase
     test 'une adhésion valide' do
-      @ad = Adhesion.new(from_date:'01/08/2013', to_date:'31/08/2013')
+      @ad = Adhesion.new(from_date:'01/08/2013', to_date:'31/08/2013', amount:10.25)
       @ad.member_id = 1
       assert_equal true, @ad.valid?
     end
@@ -17,17 +17,18 @@ module Adherent
     end
     
     test 'next_adhesion preremplit les champs' do
-      @m = adherent_members(:one)
+      @m = adherent_members(:jul)
       na = @m.next_adhesion
-      assert_equal na.from_date, I18n.l(Date.today)
+      assert_equal I18n::l(Date.today), na.from_date
     end
     
     test 'si une adhésion existe, next_adhesion preremplit avec la dernière adhésion' do
-      @m = adherent_members(:one)
-      @m.next_adhesion.save
-      first_add = @m.adhesions(true).first
+      @m = adherent_members(:jul)
+      next_adh = @m.next_adhesion
+      @m.next_adhesion.save!
+      first_adh = @m.adhesions(true).first
       na = @m.next_adhesion
-      assert_equal na.from_date, I18n.l(first_add.read_attribute(:to_date)+1)
+      assert_equal na.from_date, I18n.l(first_adh.read_attribute(:to_date)+1)
     end
     
     

data/test/unit/adherent/member_test.rb

@@ -3,13 +3,13 @@ require 'test_helper'
 module Adherent
   class MemberTest < ActiveSupport::TestCase
     test 'un membre n est pas valide si son numéro existe déja' do
-      @m = adherent_members(:one)
+      @m = adherent_members(:jcl)
       nm =Member.new(number:@m.number, name:@m.name, forname:@m.forname)
       assert_equal false, nm.valid?
     end
     
     test 'mais l est si le numéro est différent' do
-      @m = adherent_members(:one)
+      @m = adherent_members(:jcl)
       nm =Member.new(number:(@m.number + '1'), name:@m.name, forname:@m.forname)
       assert_equal true, nm.valid?
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: adherent
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Jean-Claude Lepage
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-17 00:00:00.000000000 Z
+date: 2013-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -237,6 +237,7 @@ files:
 - test/dummy/app/assets/stylesheets/scaffold.css
 - test/dummy/app/assets/stylesheets/application.css
 - test/dummy/app/models/organism.rb
+- test/dummy/app/models/adherent/organism.rb
 - test/dummy/app/views/layouts/adherent/_header.html.haml
 - test/dummy/app/views/layouts/application.html.erb
 - test/dummy/app/views/organisms/index.html.haml
@@ -248,10 +249,7 @@ files:
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/helpers/application_helper.rb
 - test/dummy/app/helpers/organisms_helper.rb
-- test/dummy/test/unit/organism_test.rb
-- test/dummy/test/unit/helpers/organisms_helper_test.rb
 - test/dummy/test/fixtures/organisms.yml
-- test/dummy/test/functional/organisms_controller_test.rb
 - test/dummy/log/test.log
 - test/dummy/log/development.log
 - test/dummy/Rakefile
@@ -370,12 +368,6 @@ files:
 - test/dummy/public/500.html
 - test/dummy/db/schema.rb
 - test/dummy/db/migrate/20130810074112_create_organisms.rb
-- test/dummy/db/migrate/20130810081838_create_adherent_payments.adherent.rb
-- test/dummy/db/migrate/20130810081835_create_adherent_members.adherent.rb
-- test/dummy/db/migrate/20130810081837_create_adherent_adhesions.adherent.rb
-- test/dummy/db/migrate/20130810081839_create_adherent_reglements.adherent.rb
-- test/dummy/db/migrate/20130810081840_add_organism_id_to_adherent_members.adherent.rb
-- test/dummy/db/migrate/20130810081836_create_adherent_coords.adherent.rb
 - test/dummy/README.rdoc
 - test/dummy/script/rails
 - test/dummy/config/locales/fr.yml
@@ -415,8 +407,8 @@ files:
 - test/test_helper.rb
 - test/functional/adherent/reglements_controller_test.rb
 - test/functional/adherent/coords_controller_test.rb
+- test/functional/adherent/adhesions_controller_test.rb
 - test/functional/adherent/members_controller_test.rb
-- test/functional/adherent/adhesion_controller_test.rb
 - test/functional/adherent/payments_controller_test.rb
 homepage: http://faiteslescomptes.fr
 licenses:
@@ -449,6 +441,7 @@ test_files:
 - test/dummy/app/assets/stylesheets/scaffold.css
 - test/dummy/app/assets/stylesheets/application.css
 - test/dummy/app/models/organism.rb
+- test/dummy/app/models/adherent/organism.rb
 - test/dummy/app/views/layouts/adherent/_header.html.haml
 - test/dummy/app/views/layouts/application.html.erb
 - test/dummy/app/views/organisms/index.html.haml
@@ -460,10 +453,7 @@ test_files:
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/helpers/application_helper.rb
 - test/dummy/app/helpers/organisms_helper.rb
-- test/dummy/test/unit/organism_test.rb
-- test/dummy/test/unit/helpers/organisms_helper_test.rb
 - test/dummy/test/fixtures/organisms.yml
-- test/dummy/test/functional/organisms_controller_test.rb
 - test/dummy/log/test.log
 - test/dummy/log/development.log
 - test/dummy/Rakefile
@@ -582,12 +572,6 @@ test_files:
 - test/dummy/public/500.html
 - test/dummy/db/schema.rb
 - test/dummy/db/migrate/20130810074112_create_organisms.rb
-- test/dummy/db/migrate/20130810081838_create_adherent_payments.adherent.rb
-- test/dummy/db/migrate/20130810081835_create_adherent_members.adherent.rb
-- test/dummy/db/migrate/20130810081837_create_adherent_adhesions.adherent.rb
-- test/dummy/db/migrate/20130810081839_create_adherent_reglements.adherent.rb
-- test/dummy/db/migrate/20130810081840_add_organism_id_to_adherent_members.adherent.rb
-- test/dummy/db/migrate/20130810081836_create_adherent_coords.adherent.rb
 - test/dummy/README.rdoc
 - test/dummy/script/rails
 - test/dummy/config/locales/fr.yml
@@ -627,6 +611,6 @@ test_files:
 - test/test_helper.rb
 - test/functional/adherent/reglements_controller_test.rb
 - test/functional/adherent/coords_controller_test.rb
+- test/functional/adherent/adhesions_controller_test.rb
 - test/functional/adherent/members_controller_test.rb
-- test/functional/adherent/adhesion_controller_test.rb
 - test/functional/adherent/payments_controller_test.rb

data/test/dummy/db/migrate/20130810081835_create_adherent_members.adherent.rb

@@ -1,13 +0,0 @@
-# This migration comes from adherent (originally 20130805145522)
-class CreateAdherentMembers < ActiveRecord::Migration
-  def change
-    create_table :adherent_members do |t|
-      t.string :number
-      t.string :name
-      t.string :forname
-      t.date :birthdate
-
-      t.timestamps
-    end
-  end
-end

data/test/dummy/db/migrate/20130810081836_create_adherent_coords.adherent.rb

@@ -1,17 +0,0 @@
-# This migration comes from adherent (originally 20130805152911)
-class CreateAdherentCoords < ActiveRecord::Migration
-  def change
-    create_table :adherent_coords do |t|
-      t.string :mail
-      t.string :tel
-      t.string :gsm
-      t.string :office
-      t.text :address
-      t.string :zip
-      t.string :city
-      t.references :member
-
-      t.timestamps
-    end
-  end
-end

data/test/dummy/db/migrate/20130810081837_create_adherent_adhesions.adherent.rb

@@ -1,15 +0,0 @@
-# This migration comes from adherent (originally 20130806053936)
-class CreateAdherentAdhesions < ActiveRecord::Migration
-  def change
-    create_table :adherent_adhesions do |t|
-      t.date :from_date
-      t.date :to_date
-      t.decimal :amount, precision: 10, scale: 2
-      t.references :member
-
-      t.timestamps
-    end
-    
-    add_index :adherent_adhesions, :member_id
-  end
-end

data/test/dummy/db/migrate/20130810081838_create_adherent_payments.adherent.rb

@@ -1,18 +0,0 @@
-# This migration comes from adherent (originally 20130808054023)
-class CreateAdherentPayments < ActiveRecord::Migration
-  def change
-    create_table :adherent_payments do |t|
-      t.date :date
-      t.decimal :amount, precision: 10, scale: 2
-      t.string :mode
-      
-      t.references :member
-
-      t.timestamps
-    end
-    
-    add_index :adherent_payments, :member_id
-    
-    
-  end
-end

data/test/dummy/db/migrate/20130810081839_create_adherent_reglements.adherent.rb

@@ -1,14 +0,0 @@
-# This migration comes from adherent (originally 20130809052125)
-class CreateAdherentReglements < ActiveRecord::Migration
-  def change
-    create_table :adherent_reglements do |t|
-      t.decimal :amount, precision: 10, scale: 2
-      t.references :adhesion
-      t.references :payment
-
-      t.timestamps
-    end
-    add_index :adherent_reglements, :adhesion_id
-    add_index :adherent_reglements, :payment_id
-  end
-end

data/test/dummy/db/migrate/20130810081840_add_organism_id_to_adherent_members.adherent.rb

@@ -1,6 +0,0 @@
-# This migration comes from adherent (originally 20130810073908)
-class AddOrganismIdToAdherentMembers < ActiveRecord::Migration
-  def change
-    add_column :adherent_members, :organism_id, :integer
-  end
-end

data/test/dummy/test/functional/organisms_controller_test.rb

@@ -1,49 +0,0 @@
-require 'test_helper'
-
-class OrganismsControllerTest < ActionController::TestCase
-  setup do
-    @organism = organisms(:one)
-  end
-
-  test "should get index" do
-    get :index
-    assert_response :success
-    assert_not_nil assigns(:organisms)
-  end
-
-  test "should get new" do
-    get :new
-    assert_response :success
-  end
-
-  test "should create organism" do
-    assert_difference('Organism.count') do
-      post :create, organism: { status: @organism.status, title: @organism.title }
-    end
-
-    assert_redirected_to organism_path(assigns(:organism))
-  end
-
-  test "should show organism" do
-    get :show, id: @organism
-    assert_response :success
-  end
-
-  test "should get edit" do
-    get :edit, id: @organism
-    assert_response :success
-  end
-
-  test "should update organism" do
-    put :update, id: @organism, organism: { status: @organism.status, title: @organism.title }
-    assert_redirected_to organism_path(assigns(:organism))
-  end
-
-  test "should destroy organism" do
-    assert_difference('Organism.count', -1) do
-      delete :destroy, id: @organism
-    end
-
-    assert_redirected_to organisms_path
-  end
-end

data/test/dummy/test/unit/helpers/organisms_helper_test.rb

@@ -1,4 +0,0 @@
-require 'test_helper'
-
-class OrganismsHelperTest < ActionView::TestCase
-end

data/test/dummy/test/unit/organism_test.rb

@@ -1,7 +0,0 @@
-require 'test_helper'
-
-class OrganismTest < ActiveSupport::TestCase
-  # test "the truth" do
-  #   assert true
-  # end
-end

data/test/functional/adherent/adhesion_controller_test.rb

@@ -1,26 +0,0 @@
-require 'test_helper'
-
-module Adherent
-  class AdhesionControllerTest < ActionController::TestCase
-    test "should get index" do
-      get :index
-      assert_response :success
-    end
-  
-    test "should get edit" do
-      get :edit
-      assert_response :success
-    end
-  
-    test "should get new" do
-      get :new
-      assert_response :success
-    end
-  
-    test "should get show" do
-      get :show
-      assert_response :success
-    end
-  
-  end
-end