Merge pull request #187 from af83/5111-begin_of_association_chain

5111 Use current_organisation as begin_of_association_chain

4 files changed, 15 insertions, 2 deletions

diff --git a/app/controllers/stop_areas_controller.rb b/app/controllers/stop_areas_controller.rb
index 178a2413f..5243ce56c 100644
--- a/app/controllers/stop_areas_controller.rb
+++ b/app/controllers/stop_areas_controller.rb
@@ -157,6 +157,10 @@ class StopAreasController < ChouetteController
     end
   end
 
+  def begin_of_association_chain
+    current_organisation
+  end
+
   private
 
   def sort_column
diff --git a/spec/controllers/stop_areas_controller_spec.rb b/spec/controllers/stop_areas_controller_spec.rb
index 2b5f8c3e2..23bca3c36 100644
--- a/spec/controllers/stop_areas_controller_spec.rb
+++ b/spec/controllers/stop_areas_controller_spec.rb
@@ -1,7 +1,7 @@
 RSpec.describe StopAreasController, :type => :controller do
   login_user
 
-  let(:stop_area_referential) { create :stop_area_referential }
+  let(:stop_area_referential) { create :stop_area_referential, member: @user.organisation }
   let(:stop_area) { create :stop_area, stop_area_referential: stop_area_referential }
 
   describe 'PUT deactivate' do
diff --git a/spec/factories/stop_area_referentials.rb b/spec/factories/stop_area_referentials.rb
index fcba996e4..bdac050b1 100644
--- a/spec/factories/stop_area_referentials.rb
+++ b/spec/factories/stop_area_referentials.rb
@@ -2,5 +2,14 @@ FactoryGirl.define do
   factory :stop_area_referential, :class => StopAreaReferential do
     sequence(:name) { |n| "StopArea Referential #{n}" }
     objectid_format 'stif_reflex'
+
+    transient do
+      member nil
+    end
+
+    after(:create) do |stop_area_referential, evaluator|
+      stop_area_referential.add_member evaluator.member if evaluator.member
+      stop_area_referential.save
+    end
   end
 end
diff --git a/spec/features/stop_areas_spec.rb b/spec/features/stop_areas_spec.rb
index 6afb22bc6..668eb2fa3 100644
--- a/spec/features/stop_areas_spec.rb
+++ b/spec/features/stop_areas_spec.rb
@@ -4,7 +4,7 @@ require 'spec_helper'
 describe "StopAreas", :type => :feature do
   login_user
 
-  let(:stop_area_referential) { create :stop_area_referential }
+  let(:stop_area_referential) { create :stop_area_referential, member: @user.organisation }
   let!(:stop_areas) { Array.new(2) { create :stop_area, stop_area_referential: stop_area_referential } }
   subject { stop_areas.first }