Add check for a single domain in git import #124
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mkanoor
reviewed
Dec 8, 2017
app/models/miq_ae_git_import.rb
Outdated
| MiqAeDomain.find_by(:name => @options['domain']).try(:destroy) if @options['domain'] && !@preview | ||
| result = MiqAeYamlImportGitfs.new(@options['domain'] || '*', @options).import | ||
| domain = Array.wrap(result).first | ||
| MiqAeDomain.find_by(:name => @options['domain']).try(:destroy) if @options['domain'] && !@previewZ |
|
Checked commits pkomanek/manageiq-automation_engine@0b5deb8~...94ab21e with ruby 2.3.3, rubocop 0.47.1, haml-lint 0.20.0, and yamllint 1.10.0 |
pkomanek
changed the title
mkanoor
approved these changes
Dec 20, 2017
simaishi
pushed a commit
that referenced
this pull request
Jan 3, 2018
Add check for a single domain in git import (cherry picked from commit 1a3c527)
|
Gaprindashvili backport details: |
mfalesni
reviewed
Jan 19, 2018
| it "raises an exception with a message about multiple domains" do | ||
| expect(MiqAeYamlImportGitfs).to receive(:new).with(domain_name, import_options) | ||
| .and_return(miq_ae_yaml_import_gitfs) | ||
| allow(miq_ae_yaml_import_gitfs).to receive(:domain_files) { ['BB8/__domain__.yaml', 'BB8/__domain__.yaml'] } |
There was a problem hiding this comment.
Wouldn't it make more sense to have the test with different directories? This looks to me like situation the code will never face - two fully identical paths :).
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Disabling the import of multiple domains from a single git repo.
based on: https://bugzilla.redhat.com/show_bug.cgi?id=1497570