Add latest changes from gitlab-org/gitlab@master

1 files changed, 34 insertions, 8 deletions

diff --git a/spec/lib/gitlab/issuable_sorter_spec.rb b/spec/lib/gitlab/issuable_sorter_spec.rb
index b8d0c7b0609..0d9940bab6f 100644
--- a/spec/lib/gitlab/issuable_sorter_spec.rb
+++ b/spec/lib/gitlab/issuable_sorter_spec.rb
@@ -4,16 +4,42 @@ require 'spec_helper'
 
 RSpec.describe Gitlab::IssuableSorter do
   let(:namespace1) { build_stubbed(:namespace, id: 1) }
-  let(:project1) { build_stubbed(:project, id: 1, namespace: namespace1) }
-
-  let(:project2) { build_stubbed(:project, id: 2, path: "a", namespace: project1.namespace) }
-  let(:project3) { build_stubbed(:project, id: 3, path: "b", namespace: project1.namespace) }
-
   let(:namespace2) { build_stubbed(:namespace, id: 2, path: "a") }
   let(:namespace3) { build_stubbed(:namespace, id: 3, path: "b") }
-  let(:project4) { build_stubbed(:project, id: 4, path: "a", namespace: namespace2) }
-  let(:project5) { build_stubbed(:project, id: 5, path: "b", namespace: namespace2) }
-  let(:project6) { build_stubbed(:project, id: 6, path: "a", namespace: namespace3) }
+
+  let(:project1) do
+    build_stubbed(:project, id: 1, namespace: namespace1, project_namespace: build_stubbed(:project_namespace))
+  end
+
+  let(:project2) do
+    build_stubbed(
+      :project, id: 2, path: "a", namespace: project1.namespace, project_namespace: build_stubbed(:project_namespace)
+    )
+  end
+
+  let(:project3) do
+    build_stubbed(
+      :project, id: 3, path: "b", namespace: project1.namespace, project_namespace: build_stubbed(:project_namespace)
+    )
+  end
+
+  let(:project4) do
+    build_stubbed(
+      :project, id: 4, path: "a", namespace: namespace2, project_namespace: build_stubbed(:project_namespace)
+    )
+  end
+
+  let(:project5) do
+    build_stubbed(
+      :project, id: 5, path: "b", namespace: namespace2, project_namespace: build_stubbed(:project_namespace)
+    )
+  end
+
+  let(:project6) do
+    build_stubbed(
+      :project, id: 6, path: "a", namespace: namespace3, project_namespace: build_stubbed(:project_namespace)
+    )
+  end
 
   let(:unsorted) { [sorted[2], sorted[3], sorted[0], sorted[1]] }