Add latest changes from gitlab-org/gitlab@master

1 files changed, 13 insertions, 1 deletions

diff --git a/spec/graphql/resolvers/crm/organizations_resolver_spec.rb b/spec/graphql/resolvers/crm/organizations_resolver_spec.rb
index 323f134ffc3..d5980bf3c41 100644
--- a/spec/graphql/resolvers/crm/organizations_resolver_spec.rb
+++ b/spec/graphql/resolvers/crm/organizations_resolver_spec.rb
@@ -55,11 +55,23 @@ RSpec.describe Resolvers::Crm::OrganizationsResolver do
       end
 
       context 'when no filter is provided' do
-        it 'returns all the organizations in the correct order' do
+        it 'returns all the organizations in the default order' do
           expect(resolve_organizations(group)).to eq([organization_a, organization_b])
         end
       end
 
+      context 'when a sort is provided' do
+        it 'returns all the organizations in the correct order' do
+          expect(resolve_organizations(group, { sort: 'NAME_DESC' })).to eq([organization_b, organization_a])
+        end
+      end
+
+      context 'when filtering for all states' do
+        it 'returns all the organizations' do
+          expect(resolve_organizations(group, { state: 'all' })).to contain_exactly(organization_a, organization_b)
+        end
+      end
+
       context 'when search term is provided' do
         it 'returns the correct organizations' do
           expect(resolve_organizations(group, { search: "def" })).to contain_exactly(organization_b)