Refactor validations and make runner factory by default to be instance-wide runner

2 files changed, 6 insertions, 16 deletions

diff --git a/spec/factories/ci/runner_projects.rb b/spec/factories/ci/runner_projects.rb
index f605e90ceed..ec15972c423 100644
--- a/spec/factories/ci/runner_projects.rb
+++ b/spec/factories/ci/runner_projects.rb
@@ -1,6 +1,6 @@
 FactoryBot.define do
   factory :ci_runner_project, class: Ci::RunnerProject do
-    runner factory: :ci_runner
+    runner factory: [:ci_runner, :project]
     project
   end
 end
diff --git a/spec/factories/ci/runners.rb b/spec/factories/ci/runners.rb
index 9d106250d08..354aa0f65fc 100644
--- a/spec/factories/ci/runners.rb
+++ b/spec/factories/ci/runners.rb
@@ -3,37 +3,27 @@ FactoryBot.define do
     sequence(:description) { |n| "My runner#{n}" }
 
     platform  "darwin"
-    is_shared false
     active    true
     access_level :not_protected
-    runner_type :project_type
 
-    trait :online do
-      contacted_at Time.now
-    end
+    is_shared true
+    runner_type :instance_type
 
-    trait :shared do
+    trait :instance do
       is_shared true
       runner_type :instance_type
     end
 
-    trait :specific do
-      is_shared false
-    end
-
     trait :group do
+      is_shared false
       runner_type :group_type
     end
 
     trait :project do
+      is_shared false
       runner_type :project_type
     end
 
-    trait :instance do
-      is_shared true
-      runner_type :instance_type
-    end
-
     trait :inactive do
       active false
     end