Merge pull request #397 from af83/6258-calendar-workgroup

Refs #6258 associate calendars with current organisation

2 files changed, 20 insertions, 0 deletions

diff --git a/app/controllers/calendars_controller.rb b/app/controllers/calendars_controller.rb
index 3d88e4910..adb3b4764 100644
--- a/app/controllers/calendars_controller.rb
+++ b/app/controllers/calendars_controller.rb
@@ -104,6 +104,10 @@ class CalendarsController < ChouetteController
     end
   end
 
+   def begin_of_association_chain
+    current_organisation
+  end
+
   def ransack_contains_date
     date =[]
     if params[:q] && !params[:q]['contains_date(1i)'].empty?
diff --git a/spec/features/calendars_spec.rb b/spec/features/calendars_spec.rb
new file mode 100644
index 000000000..26220746b
--- /dev/null
+++ b/spec/features/calendars_spec.rb
@@ -0,0 +1,16 @@
+RSpec.describe 'Calendars', type: :feature do
+  login_user
+
+  let(:calendar1)        { create(:calendar, workgroup: @user.organisation.workgroups.first, organisation: @user.organisation) }
+  let(:calendar2)        { create(:calendar) }
+
+  describe "index" do
+    before(:each) do
+      visit workgroup_calendars_path(calendar1.workgroup)
+    end
+    it "should only display calendars from same workgroup" do
+      expect(page).to have_content calendar1.name
+      expect(page).to_not have_content calendar2.name
+    end
+  end
+end
\ No newline at end of file