Refs #6201; Remove short_name from calendars

2 files changed, 0 insertions, 4 deletions

diff --git a/spec/factories/calendars.rb b/spec/factories/calendars.rb
index d9fd242d1..d78f230c6 100644
--- a/spec/factories/calendars.rb
+++ b/spec/factories/calendars.rb
@@ -1,7 +1,6 @@
 FactoryGirl.define do
   factory :calendar do
     sequence(:name) { |n| "Calendar #{n}" }
-    sequence(:short_name) { |n| "Cal #{n}" }
     date_ranges { [generate(:date_range)] }
     sequence(:dates) { |n| [ Date.yesterday - n, Date.yesterday - 2*n ] }
     shared false
@@ -14,4 +13,3 @@ FactoryGirl.define do
     date..(date+1)
   end
 end
-
diff --git a/spec/models/calendar_spec.rb b/spec/models/calendar_spec.rb
index a5c0a7471..09ac0e416 100644
--- a/spec/models/calendar_spec.rb
+++ b/spec/models/calendar_spec.rb
@@ -4,8 +4,6 @@ RSpec.describe Calendar, :type => :model do
 
   it { is_expected.to validate_presence_of(:organisation) }
   it { is_expected.to validate_presence_of(:name) }
-  it { is_expected.to validate_presence_of(:short_name) }
-  it { is_expected.to validate_uniqueness_of(:short_name) }
   it { is_expected.to be_versioned }
 
   describe '#to_time_table' do