From bb5ff3529eced48cbcd1749e55586f6379f3f37b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ana=20Mar=C3=ADa=20Mart=C3=ADnez=20G=C3=B3mez?= Date: Thu, 20 Apr 2017 10:18:23 +0200 Subject: [PATCH] [ci] Fix failing tests due to login issues There is a race condition in the branch_remote_repositories test. If `User.current` got set by another test, the branching tests fail because of permission errors in `Project#check_write_access!`. --- src/api/spec/models/project_spec.rb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/api/spec/models/project_spec.rb b/src/api/spec/models/project_spec.rb index 1815cacb977..790626495a2 100644 --- a/src/api/spec/models/project_spec.rb +++ b/src/api/spec/models/project_spec.rb @@ -103,6 +103,11 @@ describe '#branch_remote_repositories' do let(:branch_remote_repositories) { project.branch_remote_repositories("#{remote_project}:#{project}") } + before do + logout + allow(ProjectMetaFile).to receive(:new).and_return(remote_meta_xml) + end + context "normal project" do let!(:repository) { create(:repository, name: 'xUbuntu_14.04', project: project) } let(:remote_meta_xml) { @@ -140,7 +145,6 @@ let(:expected_xml) { Nokogiri::XML(local_xml_meta) } before do - allow(ProjectMetaFile).to receive(:new).and_return(remote_meta_xml) branch_remote_repositories project.reload end @@ -204,7 +208,6 @@ let(:expected_xml) { Nokogiri::XML(local_xml_meta) } before do - allow(ProjectMetaFile).to receive(:new).and_return(remote_meta_xml) branch_remote_repositories project.reload end