Merge branch 'move-edition-tests' into 'master'

Move edition tests to model where they belong

See merge request gitlab-org/gitlab!27362

ee/spec/lib/gitlab/usage_data_spec.rb

@@ -145,20 +145,6 @@ describe Gitlab::UsageData do
     end
   end
 
-  describe 'License edition names' do
-    let(:ultimate) { create(:license, plan: 'ultimate') }
-    let(:premium) { create(:license, plan: 'premium') }
-    let(:starter) { create(:license, plan: 'starter') }
-    let(:old) { create(:license, plan: 'other') }
-
-    it 'have expected values' do
-      expect(ultimate.edition).to eq('EEU')
-      expect(premium.edition).to eq('EEP')
-      expect(starter.edition).to eq('EES')
-      expect(old.edition).to eq('EE')
-    end
-  end
-
   describe '#license_usage_data' do
     subject { described_class.license_usage_data }
 

ee/spec/models/license_spec.rb

@@ -737,6 +737,20 @@ describe License do
     end
   end
 
+  describe '#edition' do
+    let(:ultimate) { build(:license, plan: 'ultimate') }
+    let(:premium) { build(:license, plan: 'premium') }
+    let(:starter) { build(:license, plan: 'starter') }
+    let(:old) { build(:license, plan: 'other') }
+
+    it 'have expected values' do
+      expect(ultimate.edition).to eq('EEU')
+      expect(premium.edition).to eq('EEP')
+      expect(starter.edition).to eq('EES')
+      expect(old.edition).to eq('EE')
+    end
+  end
+
   def set_restrictions(opts)
     gl_license.restrictions = {
       active_user_count: opts[:restricted_user_count],