Merge pull request #3998 from bgeuken/fix_flaky_test

[ci] Fix flaky test
openSUSE · Oct 12, 2017 · a50b4ed · a50b4ed
2 parents 8817c9c + f2e75f8
commit a50b4ed
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/api/spec/models/project_spec.rb b/src/api/spec/models/project_spec.rb
@@ -532,7 +532,7 @@
   end
 
   describe '#add_maintainer' do
-    subject { project }
+    subject { create(:user).home_project }
 
     it_behaves_like "makes a user a maintainer of the subject"
   end

diff --git a/src/api/spec/support/shared_examples/relationships.rb b/src/api/spec/support/shared_examples/relationships.rb
@@ -3,6 +3,9 @@
   let(:maintainer_role) { Role.where(title: 'maintainer')}
 
   before do
+    object = (subject.kind_of?(Project) ? subject : subject.project)
+    login(object.relationships.maintainers.first.user)
+
     subject.add_maintainer(other_user)
   end