summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcharlieablett <cablett@gitlab.com>2019-04-30 20:57:52 +1200
committercharlieablett <cablett@gitlab.com>2019-04-30 21:00:57 +1200
commitf2bc55d76f278e492902bec99534600d589177b7 (patch)
tree64146eb0da4b9ec2bd51fb7a2c49c1a134b4cf6f
parent3d0fc7fe2e9a5e9f3a24d3eed875044c196e5050 (diff)
downloadgitlab-ce-f2bc55d76f278e492902bec99534600d589177b7.tar.gz
Remove accidental regressions
-rw-r--r--spec/lib/gitlab/import_export/project_tree_restorer_spec.rb11
1 files changed, 6 insertions, 5 deletions
diff --git a/spec/lib/gitlab/import_export/project_tree_restorer_spec.rb b/spec/lib/gitlab/import_export/project_tree_restorer_spec.rb
index 056a1d52d78..9aafa41feee 100644
--- a/spec/lib/gitlab/import_export/project_tree_restorer_spec.rb
+++ b/spec/lib/gitlab/import_export/project_tree_restorer_spec.rb
@@ -7,8 +7,8 @@ describe Gitlab::ImportExport::ProjectTreeRestorer do
# Using an admin for import, so we can check assignment of existing members
@user = create(:admin)
@existing_members = [
- create(:user, username: 'bernard_willms'),
- create(:user, username: 'saul_will')
+ create(:user, username: 'bernard_willms'),
+ create(:user, username: 'saul_will')
]
RSpec::Mocks.with_temporary_scope do
@@ -22,12 +22,12 @@ describe Gitlab::ImportExport::ProjectTreeRestorer do
expect_any_instance_of(Gitlab::Git::Repository).to receive(:create_branch).with('feature', 'DCBA')
allow_any_instance_of(Gitlab::Git::Repository).to receive(:create_branch)
- @project_tree_restorer = described_class.new(user: @user, shared: @shared, project: @project)
+ project_tree_restorer = described_class.new(user: @user, shared: @shared, project: @project)
expect(Gitlab::ImportExport::RelationFactory).to receive(:create).with(hash_including(excluded_keys: ['whatever'])).and_call_original.at_least(:once)
- allow(@project_tree_restorer).to receive(:excluded_keys_for_relation).and_return(['whatever'])
+ allow(project_tree_restorer).to receive(:excluded_keys_for_relation).and_return(['whatever'])
- @restored_project_json = @project_tree_restorer.restore
+ @restored_project_json = project_tree_restorer.restore
end
end
@@ -76,6 +76,7 @@ describe Gitlab::ImportExport::ProjectTreeRestorer do
end
end
+
it 'creates a valid pipeline note' do
expect(Ci::Pipeline.find_by_sha('sha-notes').notes).not_to be_empty
end