Move associations and trait inside base token factory

src/api/spec/factories/tokens.rb

@@ -1,14 +1,15 @@
 FactoryBot.define do
   factory :token do
     string { Faker::Lorem.characters(number: 32) }
+    user
+    package
+
+    trait :with_package_from_association_or_param do
+      package_from_association_or_params { package }
+    end
 
     factory :service_token, class: 'Token::Service' do
       type { 'Token::Service' }
-      user
-      package
-      trait :with_package_from_association_or_param do
-        package_from_association_or_params { package }
-      end
     end
 
     factory :rss_token, class: 'Token::Rss' do
@@ -17,20 +18,10 @@
 
     factory :rebuild_token, class: 'Token::Rebuild' do
       type { 'Token::Rebuild' }
-      user
-      package
-      trait :with_package_from_association_or_param do
-        package_from_association_or_params { package }
-      end
     end
 
     factory :release_token, class: 'Token::Release' do
       type { 'Token::Release' }
-      user
-      package
-      trait :with_package_from_association_or_param do
-        package_from_association_or_params { package }
-      end
     end
   end
 end