diff options
author | Douwe Maan <douwe@gitlab.com> | 2016-07-29 20:00:13 +0300 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2016-07-29 20:00:13 +0300 |
commit | 6ad514d0663bad80e24586be0919a580cdaab8d2 (patch) | |
tree | 295c63652ef0dd4a700eaeacbe3718e82770cdc8 /spec/features | |
parent | dac2e0c43d8ca3e4c593a230dcef4eb9918a4263 (diff) | |
parent | 32d8aa6d5e1a6dbcd861a4e5baa24c3a873b57fe (diff) |
Merge branch 'fix/import-project-hooks' into 'master'
fix repo hooks missing on import
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/19556
Repo hooks are missing from imported projects
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- Tests
- [x] Added for this feature/bug
- [x] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
See merge request !5549
Diffstat (limited to 'spec/features')
-rw-r--r-- | spec/features/projects/import_export/import_file_spec.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/features/projects/import_export/import_file_spec.rb b/spec/features/projects/import_export/import_file_spec.rb index 2d1e3bbebe5..7835e1678ad 100644 --- a/spec/features/projects/import_export/import_file_spec.rb +++ b/spec/features/projects/import_export/import_file_spec.rb @@ -8,6 +8,7 @@ feature 'project import', feature: true, js: true do let(:file) { File.join(Rails.root, 'spec', 'features', 'projects', 'import_export', 'test_project_export.tar.gz') } let(:export_path) { "#{Dir::tmpdir}/import_file_spec" } let(:project) { Project.last } + let(:project_hook) { Gitlab::Git::Hook.new('post-receive', project.repository.path) } background do allow_any_instance_of(Gitlab::ImportExport).to receive(:storage_path).and_return(export_path) @@ -37,7 +38,7 @@ feature 'project import', feature: true, js: true do expect(project).not_to be_nil expect(project.issues).not_to be_empty expect(project.merge_requests).not_to be_empty - expect(project.repo_exists?).to be true + expect(project_hook).to exist expect(wiki_exists?).to be true expect(project.import_status).to eq('finished') end |