Merge branch 'next-minor' into develop

This commit is contained in:
Dennis Schubert 2018-09-30 21:44:49 +02:00
commit fe5c95e0ba
No known key found for this signature in database
GPG key ID: 5A0304BEA7966D7E

View file

@ -336,16 +336,16 @@ describe UsersController, :type => :controller do
end end
context "with inviter" do context "with inviter" do
[bob, eve].each do |inviter| it "preloads data using gon for the aspect memberships dropdown when sharing with the inviter" do
sharing = !alice.contact_for(inviter.person).nil? alice.invited_by = bob
get :getting_started
expect_gon_preloads_for_aspect_membership_dropdown(:inviter, true)
end
context sharing ? "when sharing" : "when don't share" do it "preloads data using gon for the aspect memberships dropdown when not sharing with the inviter" do
it "preloads data using gon for the aspect memberships dropdown" do alice.invited_by = eve
alice.invited_by = inviter get :getting_started
get :getting_started expect_gon_preloads_for_aspect_membership_dropdown(:inviter, false)
expect_gon_preloads_for_aspect_membership_dropdown(:inviter, sharing)
end
end
end end
end end
end end