Skip to content

Commit

Permalink
Merge pull request #12068 from bdunne/ansible_tower_duplicates
Browse files Browse the repository at this point in the history
Add uniqueness validation on Endpoint#url
  • Loading branch information
chrisarcand committed Oct 20, 2016
2 parents 93a8790 + 2a1e51f commit 97e2b60
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 11 deletions.
1 change: 1 addition & 0 deletions app/models/endpoint.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ class Endpoint < ApplicationRecord
default_value_for :verify_ssl, OpenSSL::SSL::VERIFY_PEER
validates :verify_ssl, :inclusion => {:in => [OpenSSL::SSL::VERIFY_NONE, OpenSSL::SSL::VERIFY_PEER]}
validates :port, :numericality => {:only_integer => true, :allow_nil => true, :greater_than => 0}
validates :url, :uniqueness => true, :if => :url

def verify_ssl=(val)
val = resolve_verify_ssl_value(val)
Expand Down
18 changes: 7 additions & 11 deletions spec/controllers/provider_foreman_controller_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -157,17 +157,13 @@
end
end

context "#save_provider_foreman" do
it "will not save with a duplicate name" do
ManageIQ::Providers::Foreman::Provider.create(:name => "test2Foreman",
:url => "10.8.96.103", :zone => @zone)
provider2 = ManageIQ::Providers::Foreman::Provider.new(:name => "test2Foreman",
:url => "10.8.96.103", :zone => @zone)
controller.instance_variable_set(:@provider_cfgmgmt, provider2)
allow(controller).to receive(:render_flash)
controller.save_provider_foreman
expect(assigns(:flash_array).first[:message]).to include("Configuration_manager.name has already been taken")
end
it "#save_provider_foreman will not save with a duplicate name" do
ManageIQ::Providers::Foreman::Provider.create(:name => "test2Foreman", :url => "server1", :zone => @zone)
provider2 = ManageIQ::Providers::Foreman::Provider.new(:name => "test2Foreman", :url => "server2", :zone => @zone)
controller.instance_variable_set(:@provider_cfgmgmt, provider2)
allow(controller).to receive(:render_flash)
controller.save_provider_foreman
expect(assigns(:flash_array).first[:message]).to include("Configuration_manager.name has already been taken")
end

context "#edit" do
Expand Down
12 changes: 12 additions & 0 deletions spec/models/endpoint_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,16 @@
end
end
end

context "Uniqueness validation on :url" do
it "is not required" do
expect(Endpoint.create!).to be_truthy
expect(Endpoint.create!).to be_truthy
end

it "raises when provided and already exists" do
Endpoint.create!(:url => "abc")
expect { Endpoint.create!(:url => "abc") }.to raise_error("Validation failed: Url has already been taken")
end
end
end

0 comments on commit 97e2b60

Please sign in to comment.