diff options
author | Robert Speicher <rspeicher@gmail.com> | 2015-06-22 14:33:01 -0400 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2015-06-22 14:33:01 -0400 |
commit | 649c9969ba57bf578f43310ec34e3820876b5c4c (patch) | |
tree | 834e041430dc554c90ba11820ddc5a8173465488 | |
parent | 7b9b3c5aab4fd4de55a1ba77cf4c043a110ad9cc (diff) | |
download | gitlab-ce-649c9969ba57bf578f43310ec34e3820876b5c4c.tar.gz |
Fix Style/IndentationConsistency cop violations
-rw-r--r-- | spec/lib/gitlab/satellite/action_spec.rb | 4 | ||||
-rw-r--r-- | spec/services/projects/update_service_spec.rb | 4 | ||||
-rw-r--r-- | spec/services/projects/upload_service_spec.rb | 4 |
3 files changed, 5 insertions, 7 deletions
diff --git a/spec/lib/gitlab/satellite/action_spec.rb b/spec/lib/gitlab/satellite/action_spec.rb index 28e3d64ee2b..5c05ec1d772 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 ea5b8813105..5b9b5de8c81 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 e5c47015a03..7aa26857649 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) |