Commit 593b6469 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'fix/project-tree-saver-spec' into 'master'

Fix project tree saver and fork spec failures

Closes #31746

See merge request !11076
parents 6c2569fb cf3990cf
......@@ -84,6 +84,7 @@ excluded_attributes:
- :import_jid
- :id
- :star_count
- :last_activity_at
snippets:
- :expired_at
merge_request_diff:
......
......@@ -6,7 +6,7 @@ describe Gitlab::ImportExport::ProjectTreeSaver, services: true do
let(:project_tree_saver) { described_class.new(project: project, current_user: user, shared: shared) }
let(:export_path) { "#{Dir.tmpdir}/project_tree_saver_spec" }
let(:user) { create(:user) }
let(:project) { setup_project }
let!(:project) { setup_project }
before do
project.team << [user, :master]
......@@ -219,7 +219,7 @@ describe Gitlab::ImportExport::ProjectTreeSaver, services: true do
releases: [release],
group: group
)
project.update(description_html: 'description')
project.update_column(:description_html, 'description')
project_label = create(:label, project: project)
group_label = create(:group_label, group: group)
create(:label_link, label: project_label, target: issue)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment