diff --git a/spec/lib/gitlab/satellite/action_spec.rb b/spec/lib/gitlab/satellite/action_spec.rb index 28e3d64ee2be0528484216f6dac785cd74de7339..5c05ec1d772a8fb2522406befd3e5f436a040654 100644 --- a/spec/lib/gitlab/satellite/action_spec.rb +++ b/spec/lib/gitlab/satellite/action_spec.rb @@ -18,14 +18,12 @@ describe 'Gitlab::Satellite::Action' do expect(starting_remote_count).to be >= 1 #kind of hookey way to add a second remote origin_uri = repo.git.remote({v: true}).split(" ")[1] - begin + repo.git.remote({raise: true}, 'add', 'another-remote', origin_uri) repo.git.branch({raise: true}, 'a-new-branch') expect(repo.heads.size).to be > (starting_remote_count) expect(repo.git.remote().split(" ").size).to be > (starting_remote_count) - rescue - end repo.git.config({}, "user.name", "#{user.name} -- foo") repo.git.config({}, "user.email", "#{user.email} -- foo") diff --git a/spec/services/projects/update_service_spec.rb b/spec/services/projects/update_service_spec.rb index ea5b8813105ca7f1a7b6f4585e2ebb2c8a341ac3..5b9b5de8c81ce8f0ec682e6958d0170d32b76141 100644 --- a/spec/services/projects/update_service_spec.rb +++ b/spec/services/projects/update_service_spec.rb @@ -13,8 +13,8 @@ describe Projects::UpdateService do before do @created_private = @project.private? - @opts.merge!(visibility_level: Gitlab::VisibilityLevel::PRIVATE) - update_project(@project, @user, @opts) + @opts.merge!(visibility_level: Gitlab::VisibilityLevel::PRIVATE) + update_project(@project, @user, @opts) end it { expect(@created_private).to be_truthy } diff --git a/spec/services/projects/upload_service_spec.rb b/spec/services/projects/upload_service_spec.rb index e5c47015a033c096d406bfe82fb1d6db5418a6c9..7aa26857649aacf5bc5c6413de7218175fc060fb 100644 --- a/spec/services/projects/upload_service_spec.rb +++ b/spec/services/projects/upload_service_spec.rb @@ -22,7 +22,7 @@ describe Projects::UploadService do it { expect(@link_to_file['url']).to match('banana_sample.gif') } end - context 'for valid png file' do + context 'for valid png file' do before do png = fixture_file_upload(Rails.root + 'spec/fixtures/dk.png', 'image/png') @@ -38,7 +38,7 @@ describe Projects::UploadService do it { expect(@link_to_file['url']).to match('dk.png') } end - context 'for valid jpg file' do + context 'for valid jpg file' do before do jpg = fixture_file_upload(Rails.root + 'spec/fixtures/rails_sample.jpg', 'image/jpg') @link_to_file = upload_file(@project.repository, jpg)