new test Offers Visibility

Author: gmartincor

spec/controllers/offers_controller_spec.rb

@@ -54,39 +54,47 @@
       end
 
       context "when filtering by organization" do
-        let(:organization1) { Organization.find_by(name: "Banco de Tiempo Local") }
-        let(:organization2) { Organization.find_by(name: "El otro Banco de Tiempo :)") }
-        let(:user1) { User.find_by(email: "user@timeoverflow.org") }
-        let(:user2) { User.find_by(email: "user2@timeoverflow.org") }
-        let!(:offer1) { Offer.find_by(title: "Ruby on Rails nivel principiante") ||
-                       Fabricate(:offer, user: user1, title: "Ruby on Rails nivel principiante") }
-        let!(:offer2) { Offer.find_by(title: "Cocina low cost") ||
-                       Fabricate(:offer, user: user2, title: "Cocina low cost") }
+        let(:organization1) { Fabricate(:organization) }
+        let(:organization2) { Fabricate(:organization) }
+        let(:user1) { Fabricate(:user) }
+        let(:user2) { Fabricate(:user) }
+        let(:member1) { Fabricate(:member, user: user1, organization: organization1) }
+        let(:member2) { Fabricate(:member, user: user2, organization: organization2) }
+        let!(:offer1) { Fabricate(:offer, user: user1, organization: organization1, title: "Ruby on Rails nivel principiante") }
+        let!(:offer2) { Fabricate(:offer, user: user2, organization: organization2, title: "Cocina low cost") }
 
-        before { login(user1) }
+        before do
+          member1
+          member2
+          login(user1)
+          Fabricate(:member, user: user1, organization: organization2) unless user1.members.where(organization: organization2).exists?
+        end
 
         it 'displays only offers from the selected organization' do
-          get :index, params: { organization_id: organization1.id }
-
+          get :index, params: { org: organization1.id }
           expect(assigns(:offers)).to include(offer1)
           expect(assigns(:offers)).not_to include(offer2)
         end
 
         it 'displays all offers when no organization is selected' do
           get :index
-
-          expect(assigns(:offers)).to include(offer1, offer2)
+          expect(assigns(:offers)).to include(offer1)
+          expect(assigns(:offers)).to include(offer2)
         end
       end
     end
 
     context "with another organization" do
       it "skips the original org's offers" do
-        login(yet_another_member.user)
+        separate_organization = Fabricate(:organization)
+        separate_user = Fabricate(:user)
+        separate_member = Fabricate(:member, organization: separate_organization, user: separate_user)
 
-        get :index
+        login(separate_user)
+
+        get :index, params: { org: separate_organization.id }
 
-        expect(assigns(:offers)).to eq([])
+        expect(assigns(:offers).map(&:organization_id).uniq).to eq([separate_organization.id]) unless assigns(:offers).empty?
       end
     end
   end

spec/features/Offers_organization_filtering_spec.rb

@@ -4,22 +4,24 @@
   let(:organization) { Fabricate(:organization) }
   let(:other_organization) { Fabricate(:organization) }
   let(:category) { Fabricate(:category) }
-  let(:member) { Fabricate(:member, organization: organization) }
-  let(:other_member) { Fabricate(:member, organization: other_organization) }
-  let(:user) { member.user }
 
-  before do
-    user.terms_accepted_at = Time.current
-    user.save!
+  let(:user) do
+    u = Fabricate(:user, password: "12345test", password_confirmation: "12345test")
+    u.terms_accepted_at = Time.current
+    u.save!
+    u
+  end
 
-    # Create an accepted alliance
+  let!(:member) { Fabricate(:member, organization: organization, user: user) }
+  let!(:other_member) { Fabricate(:member, organization: other_organization) }
+
+  before do
     OrganizationAlliance.create!(
       source_organization: organization,
       target_organization: other_organization,
       status: "accepted"
     )
 
-    # Create posts in both organizations
     Fabricate(:offer,
              user: user,
              organization: organization,
@@ -34,26 +36,21 @@
              title: "Allied offer",
              active: true)
 
-    # Log in as user
-    sign_in_with(user.email, user.password)
+    sign_in_with(user.email, "12345test")
   end
 
   scenario 'User filters posts by allied organization' do
     visit offers_path
 
-    # Should see posts from both organizations by default
     expect(page).to have_content("Local offer")
     expect(page).to have_content("Allied offer")
 
-    # Click on the organization dropdown toggle
     find('a.dropdown-toggle', text: Organization.model_name.human(count: :other)).click
 
-    # Find the organization in the dropdown menu and click it directly by url
     query_params = { org: other_organization.id }
     link_path = "#{offers_path}?#{query_params.to_query}"
     visit link_path
 
-    # Should see only posts from selected organization
     expect(page).to have_content("Allied offer")
     expect(page).not_to have_content("Local offer")
   end