Add latest changes from gitlab-org/gitlab@master

2 files changed, 72 insertions, 0 deletions

diff --git a/spec/serializers/import/github_org_entity_spec.rb b/spec/serializers/import/github_org_entity_spec.rb
new file mode 100644
index 00000000000..46fceb8ac60
--- /dev/null
+++ b/spec/serializers/import/github_org_entity_spec.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Import::GithubOrgEntity do
+  let(:org_data) do
+    {
+      'id' => 12345,
+      'login' => 'org-name',
+      'url' => 'https://api.github.com/orgs/org-name',
+      'avatar_url' => 'https://avatars.githubusercontent.com/u/12345?v=4',
+      'node_id' => 'O_teStT',
+      'description' => ''
+    }
+  end
+
+  subject { described_class.new(org_data).as_json }
+
+  it 'exposes correct attributes' do
+    expect(subject.keys).to contain_exactly(
+      :description,
+      :name
+    )
+  end
+end
diff --git a/spec/serializers/import/github_org_serializer_spec.rb b/spec/serializers/import/github_org_serializer_spec.rb
new file mode 100644
index 00000000000..4206914cd6e
--- /dev/null
+++ b/spec/serializers/import/github_org_serializer_spec.rb
@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Import::GithubOrgSerializer do
+  it 'represents GithubOrgEntity entities' do
+    expect(described_class.entity_class).to eq(Import::GithubOrgEntity)
+  end
+
+  describe '#represent' do
+    let(:org_data) do
+      {
+        id: 123456,
+        login: 'org-name',
+        node_id: 'O_teStT',
+        url: 'https://api.github.com/orgs/org-name',
+        repos_url: 'https://api.github.com/orgs/org-name/repos',
+        events_url: 'https://api.github.com/orgs/org-name/events',
+        hooks_url: 'https://api.github.com/orgs/org-name/hooks',
+        issues_url: 'https://api.github.com/orgs/org-name/issues',
+        members_url: 'https://api.github.com/orgs/org-name/members{/member}',
+        public_members_url: 'https://api.github.com/orgs/org-name/public_members{/member}',
+        avatar_url: 'avatar_url',
+        description: 'description'
+      }
+    end
+
+    subject { described_class.new.represent(resource) }
+
+    context 'when a single object is being serialized' do
+      let(:resource) { org_data }
+
+      it 'serializes organization object' do
+        expect(subject).to eq({ name: 'org-name', description: 'description' })
+      end
+    end
+
+    context 'when multiple objects are being serialized' do
+      let(:count) { 3 }
+      let(:resource) { Array.new(count, org_data) }
+
+      it 'serializes array of organizations' do
+        expect(subject).to all(eq({ name: 'org-name', description: 'description' }))
+      end
+    end
+  end
+end