Fixed code that displays values saved for NTP Servers for selected zone #3568
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
h-kataria
force-pushed
the
display_ntp_servers_for_zone
branch
from
dff18d4
to
d7bdfcb
Compare
bdunne
reviewed
Mar 12, 2018
| it 'sets ntp server info for display' do | ||
| controller.instance_variable_set(:@sb, :active_tab => 'settings_zone') | ||
| controller.instance_variable_set(:@edit, :new => {:ntp => {:server => ["zone1.pool.com", "zone2.pool.com"]}}) | ||
| @zone = FactoryGirl.create(:zone) |
There was a problem hiding this comment.
Does this need to be an @ variable? It won't be reused outside of the test context, right?
| controller.instance_variable_set(:@edit, :new => {:ntp => {:server => ["zone1.pool.com", "zone2.pool.com"]}}) | ||
| @zone = FactoryGirl.create(:zone) | ||
| controller.send(:zone_save_ntp_server_settings, @zone) | ||
| @miq_server = FactoryGirl.create(:miq_server, :zone => @zone) |
| @zone = FactoryGirl.create(:zone) | ||
| controller.send(:zone_save_ntp_server_settings, @zone) | ||
| @miq_server = FactoryGirl.create(:miq_server, :zone => @zone) | ||
| allow(MiqServer).to receive(:my_server).and_return(@miq_server) |
There was a problem hiding this comment.
We already have a helper to creates everything you need here. _guid, miq_server, zone = EvmSpecHelper.local_guid_miq_server_zone
| context 'zone node' do | ||
| it 'sets ntp server info for display' do | ||
| controller.instance_variable_set(:@sb, :active_tab => 'settings_zone') | ||
| controller.instance_variable_set(:@edit, :new => {:ntp => {:server => ["zone1.pool.com", "zone2.pool.com"]}}) |
There was a problem hiding this comment.
Prefer the example.org or example.com IANA example domains for test data.
h-kataria
force-pushed
the
display_ntp_servers_for_zone
branch
from
d7bdfcb
to
8dc7fee
Compare
|
@bdunne updated spec test as per your comments. |
|
Checked commit h-kataria@8dc7fee with ruby 2.3.3, rubocop 0.52.1, haml-lint 0.20.0, and yamllint 1.10.0 **
app/controllers/ops_controller/settings/common.rb
|
simaishi
pushed a commit
that referenced
this pull request
Mar 13, 2018
Fixed code that displays values saved for NTP Servers for selected zone (cherry picked from commit 77424ab) Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1554825
|
Gaprindashvili backport details: |
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.
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1553771
before:
after:
@bdunne @chrisarcand please review, fixed to display NTP servers values for a Zone, this issue was introduced by changes in following 2 PRs
#2720
#2359 (fixes saving of NTP servers from UI)
@dclarizio please review.