Skip to content

Commit

Permalink
Some changes based on CR.
Browse files Browse the repository at this point in the history
  • Loading branch information
teclator committed May 16, 2017
1 parent f199199 commit bc3b528
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 9 deletions.
2 changes: 1 addition & 1 deletion src/lib/installation/dialogs/registration_url_dialog.rb
Expand Up @@ -27,7 +27,7 @@ class RegistrationURLDialog < ::Installation::URLDialog
def help_text
# TRANSLATORS: Help text alerting the user about a invalid url
_("<p>\n" \
"The registration url provided in the command line is not valid.\n" \
"The registration URL provided in the command line is not valid.\n" \
"Check that you entered it correctly and try again.\n" \
"</p>")
end
Expand Down
8 changes: 2 additions & 6 deletions src/lib/installation/dialogs/url_dialog.rb
Expand Up @@ -123,9 +123,7 @@ def entry_label
#
# @see help_text
def show_help?
return true if !help_text.empty?

false
!help_text.empty?
end

# Determines wether the dialog title is shown
Expand All @@ -134,9 +132,7 @@ def show_help?
#
# @see dialog_title
def show_heading?
return true if !dialog_title.empty?

false
!dialog_title.empty?
end
end
end
4 changes: 2 additions & 2 deletions test/inst_install_inf_test.rb
Expand Up @@ -22,7 +22,7 @@

context "when a regurl is provided by linuxrc" do
let(:invalid_url) { "http://wrong_url{}.com" }
let(:valid_url) { "http://scc.custom.com" }
let(:valid_url) { "https://scc.custom.com" }

it "allows the user to fix it it's invalid" do
expect(Yast::Linuxrc).to receive(:InstallInf).with("regurl").and_return(invalid_url)
Expand All @@ -31,7 +31,7 @@
subject.main
end

it "does nothing with the url in case of valid" do
it "does nothing with the URL in case of valid" do
expect(Yast::Linuxrc).to receive(:InstallInf).with("regurl").and_return(valid_url)
expect(subject).to_not receive(:fix_regurl!)

Expand Down

0 comments on commit bc3b528

Please sign in to comment.