Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions lib/linux_admin/dns.rb
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ def reload
end

def save
contents = "search #{@search_order.join(" ")}\n"
@nameservers.each { |ns| contents += "nameserver #{ns}\n" }
File.write(@filename, contents)
search = "search #{@search_order.join(" ")}\n" unless @search_order.empty?
servers = @nameservers.collect { |ns| "nameserver #{ns}\n" }.join
File.write(@filename, "#{search}#{servers}")
end
end
end
30 changes: 30 additions & 0 deletions spec/dns_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,16 @@
search new.test.example.com other.test.example.com
nameserver 192.168.3.4
nameserver 10.10.11.12
DNS_END

NO_SEARCH = <<DNS_END
nameserver 192.168.1.2
nameserver 10.10.1.2
nameserver 192.168.252.3
DNS_END

NO_NAMESERVER = <<DNS_END
search test.example.com test.two.example.com. example.com.
DNS_END

NEW_ORDER = %w(new.test.example.com other.test.example.com)
Expand Down Expand Up @@ -71,5 +81,25 @@
subject.nameservers = NEW_NS
subject.save
end

it "omits search if the list is empty" do
expect(File).to receive(:write) do |file, contents|
expect(file).to eq(subject.filename)
expect(contents).to eq(NO_SEARCH)
end

subject.search_order = []
subject.save
end

it "omits nameserver if the list is empty" do
expect(File).to receive(:write) do |file, contents|
expect(file).to eq(subject.filename)
expect(contents).to eq(NO_NAMESERVER)
end

subject.nameservers = []
subject.save
end
end
end