From 784fae4b9d7e92350075df2a43d06893080ed1e6 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 12 Dec 2019 12:07:33 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- spec/lib/gitlab/phabricator_import/cache/map_spec.rb | 1 + spec/lib/gitlab/phabricator_import/importer_spec.rb | 1 + spec/lib/gitlab/phabricator_import/project_creator_spec.rb | 1 + spec/lib/gitlab/phabricator_import/user_finder_spec.rb | 1 + 4 files changed, 4 insertions(+) (limited to 'spec/lib/gitlab/phabricator_import') diff --git a/spec/lib/gitlab/phabricator_import/cache/map_spec.rb b/spec/lib/gitlab/phabricator_import/cache/map_spec.rb index b6629fad453..14a5d40d445 100644 --- a/spec/lib/gitlab/phabricator_import/cache/map_spec.rb +++ b/spec/lib/gitlab/phabricator_import/cache/map_spec.rb @@ -5,6 +5,7 @@ require 'spec_helper' describe Gitlab::PhabricatorImport::Cache::Map, :clean_gitlab_redis_cache do set(:project) { create(:project) } let(:redis) { Gitlab::Redis::Cache } + subject(:map) { described_class.new(project) } describe '#get_gitlab_model' do diff --git a/spec/lib/gitlab/phabricator_import/importer_spec.rb b/spec/lib/gitlab/phabricator_import/importer_spec.rb index 99a6e4dad6b..2715b785379 100644 --- a/spec/lib/gitlab/phabricator_import/importer_spec.rb +++ b/spec/lib/gitlab/phabricator_import/importer_spec.rb @@ -11,6 +11,7 @@ describe Gitlab::PhabricatorImport::Importer do describe '#execute' do let(:project) { create(:project, :import_scheduled) } + subject(:importer) { described_class.new(project) } it 'sets a custom jid that will be kept up to date' do diff --git a/spec/lib/gitlab/phabricator_import/project_creator_spec.rb b/spec/lib/gitlab/phabricator_import/project_creator_spec.rb index fd17284eea2..0b6a71290ed 100644 --- a/spec/lib/gitlab/phabricator_import/project_creator_spec.rb +++ b/spec/lib/gitlab/phabricator_import/project_creator_spec.rb @@ -8,6 +8,7 @@ describe Gitlab::PhabricatorImport::ProjectCreator do phabricator_server_url: 'http://phab.example.com', api_token: 'the-token' } end + subject(:creator) { described_class.new(user, params) } describe '#execute' do diff --git a/spec/lib/gitlab/phabricator_import/user_finder_spec.rb b/spec/lib/gitlab/phabricator_import/user_finder_spec.rb index 918ff28c8f5..14a00deeb16 100644 --- a/spec/lib/gitlab/phabricator_import/user_finder_spec.rb +++ b/spec/lib/gitlab/phabricator_import/user_finder_spec.rb @@ -4,6 +4,7 @@ require 'spec_helper' describe Gitlab::PhabricatorImport::UserFinder, :clean_gitlab_redis_cache do let(:project) { create(:project, namespace: create(:group)) } + subject(:finder) { described_class.new(project, ['first-phid', 'second-phid']) } before do -- cgit v1.2.3