Fixes #12885 - Remove forcing 'no whitespace' from policy name

theforeman · May 24, 2016 · e3af523 · e3af523
1 parent cd59dd8
commit e3af523
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/app/models/foreman_openscap/policy.rb b/app/models/foreman_openscap/policy.rb
@@ -21,7 +21,7 @@ class Policy < ActiveRecord::Base
     SERVER_CLASS_PARAMETER   = 'server'
     PORT_CLASS_PARAMETER     = 'port'
 
-    validates :name, :presence => true, :uniqueness => true, :format => { :without => /\s/ }
+    validates :name, :presence => true, :uniqueness => true
     validate :ensure_needed_puppetclasses
     validates :period, :inclusion => {:in => %w(weekly monthly custom)},
               :if                 => Proc.new { |policy| policy.new_record? ? policy.step_index > 3 : !policy.id.blank? }

diff --git a/test/functional/api/v2/compliance/policies_controller_test.rb b/test/functional/api/v2/compliance/policies_controller_test.rb
@@ -31,7 +31,7 @@ class Api::V2::Compliance::PoliciesControllerTest < ActionController::TestCase
 
   test "should not update invalid" do
     policy = FactoryGirl.create(:policy)
-    put :update, {:id => policy.id, :policy => {:name => 'say my name'}}
+    put :update, {:id => policy.id, :policy => {:name => ''}}
     assert_response :unprocessable_entity
   end
 

diff --git a/test/unit/policy_test.rb b/test/unit/policy_test.rb
@@ -0,0 +1,8 @@
+require 'test_helper'
+
+class PolicyTest < ActiveSupport::TestCase
+  it 'can have spaces in name' do
+    policy = FactoryGirl.build(:policy, name: "My spaced policy")
+    assert policy.valid?
+  end
+end