Merge commit '83f0798e7dc588f0e4cb6816daadeef7dbfc8b81' into fix/gb/encrypt-runners-tokens

* commit '83f0798e7dc588f0e4cb6816daadeef7dbfc8b81': (101 commits)

2 files changed, 11 insertions, 9 deletions

diff --git a/spec/migrations/clean_up_for_members_spec.rb b/spec/migrations/clean_up_for_members_spec.rb
index 0258860d169..7876536cb3e 100644
--- a/spec/migrations/clean_up_for_members_spec.rb
+++ b/spec/migrations/clean_up_for_members_spec.rb
@@ -3,6 +3,7 @@ require Rails.root.join('db', 'migrate', '20171216111734_clean_up_for_members.rb
 
 describe CleanUpForMembers, :migration do
   let(:migration) { described_class.new }
+  let(:groups) { table(:namespaces) }
   let!(:group_member) { create_group_member }
   let!(:unbinded_group_member) { create_group_member }
   let!(:invited_group_member) { create_group_member(true) }
@@ -25,7 +26,7 @@ describe CleanUpForMembers, :migration do
   end
 
   def create_group_member(invited = false)
-    fill_member(GroupMember.new(group: create_group), invited)
+    fill_member(GroupMember.new(source_id: create_group.id, source_type: 'Namespace'), invited)
   end
 
   def create_project_member(invited = false)
@@ -54,7 +55,7 @@ describe CleanUpForMembers, :migration do
   def create_group
     name = FFaker::Lorem.characters(10)
 
-    Group.create(name: name, path: name.downcase.gsub(/\s/, '_'))
+    groups.create!(type: 'Group', name: name, path: name.downcase.gsub(/\s/, '_'))
   end
 
   def create_project
diff --git a/spec/migrations/delete_inconsistent_internal_id_records_spec.rb b/spec/migrations/delete_inconsistent_internal_id_records_spec.rb
index 4af51217031..8c55daf0d37 100644
--- a/spec/migrations/delete_inconsistent_internal_id_records_spec.rb
+++ b/spec/migrations/delete_inconsistent_internal_id_records_spec.rb
@@ -94,17 +94,18 @@ describe DeleteInconsistentInternalIdRecords, :migration do
   end
 
   context 'for milestones (by group)' do
-    # milestones (by group) is a little different than all of the other models
-    let!(:group1) { create(:group) }
-    let!(:group2) { create(:group) }
-    let!(:group3) { create(:group) }
+    # milestones (by group) is a little different than most of the other models
+    let(:groups)  { table(:namespaces) }
+    let(:group1) { groups.create(name: 'Group 1', type: 'Group', path: 'group_1') }
+    let(:group2) { groups.create(name: 'Group 2', type: 'Group', path: 'group_2') }
+    let(:group3) { groups.create(name: 'Group 2', type: 'Group', path: 'group_3') }
 
     let(:internal_id_query) { ->(group) { InternalId.where(usage: InternalId.usages['milestones'], namespace: group) } }
 
     before do
-      3.times { create(:milestone, group: group1) }
-      3.times { create(:milestone, group: group2) }
-      3.times { create(:milestone, group: group3) }
+      3.times { create(:milestone, group_id: group1.id) }
+      3.times { create(:milestone, group_id: group2.id) }
+      3.times { create(:milestone, group_id: group3.id) }
 
       internal_id_query.call(group1).first.tap do |iid|
         iid.last_value = iid.last_value - 2