diff options
author | James Lopez <james@jameslopez.es> | 2016-08-03 13:00:34 +0200 |
---|---|---|
committer | James Lopez <james@jameslopez.es> | 2016-08-03 13:00:34 +0200 |
commit | f87eb2502023fb0c17d29aef398058c62736c9ca (patch) | |
tree | c569dd3588242d17537a3ffe69d77696dc6b4191 | |
parent | e63729d9e70a661fb3fb8cb558716f6a44a52798 (diff) | |
download | gitlab-ce-fix/import-error.tar.gz |
Fix Import/Export error checking versionsfix/import-error
-rw-r--r-- | CHANGELOG | 3 | ||||
-rw-r--r-- | lib/gitlab/import_export/version_checker.rb | 2 | ||||
-rw-r--r-- | spec/lib/gitlab/import_export/version_checker_spec.rb | 30 |
3 files changed, 34 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index db2617dcbd7..b299337aef9 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -56,6 +56,9 @@ v 8.11.0 (unreleased) - Fix RequestProfiler::Middleware error when code is reloaded in development - Catch what warden might throw when profiling requests to re-throw it +v 8.10.4 (unreleased) + - Fix Import/Export error checking versions + v 8.10.3 - Fix Import/Export issue importing milestones and labels not associated properly. !5426 - Fix timing problems running imports on production. !5523 diff --git a/lib/gitlab/import_export/version_checker.rb b/lib/gitlab/import_export/version_checker.rb index abfc694b879..de3fe6d822e 100644 --- a/lib/gitlab/import_export/version_checker.rb +++ b/lib/gitlab/import_export/version_checker.rb @@ -25,7 +25,7 @@ module Gitlab def verify_version!(version) if Gem::Version.new(version) > Gem::Version.new(Gitlab::ImportExport.version) - raise Gitlab::ImportExport::Error("Import version mismatch: Required <= #{Gitlab::ImportExport.version} but was #{version}") + raise Gitlab::ImportExport::Error.new("Import version mismatch: Required <= #{Gitlab::ImportExport.version} but was #{version}") else true end diff --git a/spec/lib/gitlab/import_export/version_checker_spec.rb b/spec/lib/gitlab/import_export/version_checker_spec.rb new file mode 100644 index 00000000000..90c6d1c67f6 --- /dev/null +++ b/spec/lib/gitlab/import_export/version_checker_spec.rb @@ -0,0 +1,30 @@ +require 'spec_helper' + +describe Gitlab::ImportExport::VersionChecker, services: true do + describe 'bundle a project Git repo' do + let(:shared) { Gitlab::ImportExport::Shared.new(relative_path: '') } + let(:version) { Gitlab::ImportExport.version } + + before do + allow(File).to receive(:open).and_return(version) + end + + it 'returns true if Import/Export have the same version' do + expect(described_class.check!(shared: shared)).to be true + end + + context 'newer version' do + let(:version) { '900.0'} + + it 'returns false if export version is newer' do + expect(described_class.check!(shared: shared)).to be false + end + + it 'shows the correct error message' do + described_class.check!(shared: shared) + + expect(shared.errors.first).to eq("Import version mismatch: Required <= #{Gitlab::ImportExport.version} but was #{version}") + end + end + end +end |