diff options
author | Douwe Maan <douwe@selenight.nl> | 2017-02-22 12:03:32 -0600 |
---|---|---|
committer | Douwe Maan <douwe@selenight.nl> | 2017-02-23 09:32:42 -0600 |
commit | e2bbbb1a9aea72e4313cdc257460eb416fe8dc0b (patch) | |
tree | 38d334adcffc86edb6024fe2d77506d601093ed2 /spec/lib | |
parent | 75f5fa997de148c9bc0e5bd6e6f6050526a0b164 (diff) | |
download | gitlab-ce-e2bbbb1a9aea72e4313cdc257460eb416fe8dc0b.tar.gz |
Fix new offenses
Diffstat (limited to 'spec/lib')
-rw-r--r-- | spec/lib/expand_variables_spec.rb | 14 | ||||
-rw-r--r-- | spec/lib/gitlab/bitbucket_import/importer_spec.rb | 4 | ||||
-rw-r--r-- | spec/lib/gitlab/ci/config/entry/global_spec.rb | 4 | ||||
-rw-r--r-- | spec/lib/gitlab/ci/config/entry/job_spec.rb | 10 | ||||
-rw-r--r-- | spec/lib/gitlab/ci/status/build/factory_spec.rb | 2 | ||||
-rw-r--r-- | spec/lib/gitlab/import_sources_spec.rb | 32 | ||||
-rw-r--r-- | spec/lib/gitlab/incoming_email_spec.rb | 4 |
7 files changed, 36 insertions, 34 deletions
diff --git a/spec/lib/expand_variables_spec.rb b/spec/lib/expand_variables_spec.rb index 9fe15993a7d..730ca1f7c0a 100644 --- a/spec/lib/expand_variables_spec.rb +++ b/spec/lib/expand_variables_spec.rb @@ -15,41 +15,41 @@ describe ExpandVariables do result: 'keyvalue', variables: [ { key: 'variable', value: 'value' } - ]}, + ] }, { value: 'key${variable}', result: 'keyvalue', variables: [ { key: 'variable', value: 'value' } - ]}, + ] }, { value: 'key$variable$variable2', result: 'keyvalueresult', variables: [ { key: 'variable', value: 'value' }, { key: 'variable2', value: 'result' }, - ]}, + ] }, { value: 'key${variable}${variable2}', result: 'keyvalueresult', variables: [ { key: 'variable', value: 'value' }, { key: 'variable2', value: 'result' } - ]}, + ] }, { value: 'key$variable2$variable', result: 'keyresultvalue', variables: [ { key: 'variable', value: 'value' }, { key: 'variable2', value: 'result' }, - ]}, + ] }, { value: 'key${variable2}${variable}', result: 'keyresultvalue', variables: [ { key: 'variable', value: 'value' }, { key: 'variable2', value: 'result' } - ]}, + ] }, { value: 'review/$CI_BUILD_REF_NAME', result: 'review/feature/add-review-apps', variables: [ { key: 'CI_BUILD_REF_NAME', value: 'feature/add-review-apps' } - ]}, + ] }, ] tests.each do |test| diff --git a/spec/lib/gitlab/bitbucket_import/importer_spec.rb b/spec/lib/gitlab/bitbucket_import/importer_spec.rb index 9e557d06ef0..aceb6bf871c 100644 --- a/spec/lib/gitlab/bitbucket_import/importer_spec.rb +++ b/spec/lib/gitlab/bitbucket_import/importer_spec.rb @@ -89,8 +89,8 @@ describe Gitlab::BitbucketImport::Importer, lib: true do stub_request(:get, "https://api.bitbucket.org/2.0/repositories/namespace/repo?pagelen=50&sort=created_on") .with(headers: { 'Accept' => '*/*', 'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization' => 'Bearer', 'User-Agent' => 'Faraday v0.9.2' }) .to_return(status: 200, - body: "", - headers: {}) + body: "", + headers: {}) sample_issues_statuses.each_with_index do |issue, index| stub_request( diff --git a/spec/lib/gitlab/ci/config/entry/global_spec.rb b/spec/lib/gitlab/ci/config/entry/global_spec.rb index d9e48715984..ebd80ac5e1d 100644 --- a/spec/lib/gitlab/ci/config/entry/global_spec.rb +++ b/spec/lib/gitlab/ci/config/entry/global_spec.rb @@ -12,8 +12,8 @@ describe Gitlab::Ci::Config::Entry::Global do it 'contains the expected node names' do expect(described_class.nodes.keys) .to match_array(%i[before_script image services - after_script variables stages - types cache]) + after_script variables stages + types cache]) end end end diff --git a/spec/lib/gitlab/ci/config/entry/job_spec.rb b/spec/lib/gitlab/ci/config/entry/job_spec.rb index 7a733e6a4a7..d20f4ec207d 100644 --- a/spec/lib/gitlab/ci/config/entry/job_spec.rb +++ b/spec/lib/gitlab/ci/config/entry/job_spec.rb @@ -140,11 +140,11 @@ describe Gitlab::Ci::Config::Entry::Job do it 'returns correct value' do expect(entry.value) .to eq(name: :rspec, - before_script: %w[ls pwd], - script: %w[rspec], - commands: "ls\npwd\nrspec", - stage: 'test', - after_script: %w[cleanup]) + before_script: %w[ls pwd], + script: %w[rspec], + commands: "ls\npwd\nrspec", + stage: 'test', + after_script: %w[cleanup]) end end end diff --git a/spec/lib/gitlab/ci/status/build/factory_spec.rb b/spec/lib/gitlab/ci/status/build/factory_spec.rb index 16f0a7b5388..0c40fca0c1a 100644 --- a/spec/lib/gitlab/ci/status/build/factory_spec.rb +++ b/spec/lib/gitlab/ci/status/build/factory_spec.rb @@ -69,7 +69,7 @@ describe Gitlab::Ci::Status::Build::Factory do it 'matches correct extended statuses' do expect(factory.extended_statuses) .to eq [Gitlab::Ci::Status::Build::Retryable, - Gitlab::Ci::Status::Build::FailedAllowed] + Gitlab::Ci::Status::Build::FailedAllowed] end it 'fabricates a failed but allowed build status' do diff --git a/spec/lib/gitlab/import_sources_spec.rb b/spec/lib/gitlab/import_sources_spec.rb index 962af8bdf42..b3b5e5e7e33 100644 --- a/spec/lib/gitlab/import_sources_spec.rb +++ b/spec/lib/gitlab/import_sources_spec.rb @@ -23,14 +23,15 @@ describe Gitlab::ImportSources do it 'returns an array' do expected = %w( -github -bitbucket -gitlab -google_code -fogbugz -git -gitlab_project -gitea) + github + bitbucket + gitlab + google_code + fogbugz + git + gitlab_project + gitea + ) expect(described_class.values).to eq(expected) end @@ -40,13 +41,14 @@ gitea) it 'returns an array of importer names' do expected = %w( -github -bitbucket -gitlab -google_code -fogbugz -gitlab_project -gitea) + github + bitbucket + gitlab + google_code + fogbugz + gitlab_project + gitea + ) expect(described_class.importer_names).to eq(expected) end diff --git a/spec/lib/gitlab/incoming_email_spec.rb b/spec/lib/gitlab/incoming_email_spec.rb index 66fc3ad0c3b..698bd72d0f8 100644 --- a/spec/lib/gitlab/incoming_email_spec.rb +++ b/spec/lib/gitlab/incoming_email_spec.rb @@ -101,8 +101,8 @@ describe Gitlab::IncomingEmail, lib: true do it 'returns reply key' do expect(described_class.scan_fallback_references(references)) .to eq(%w[issue_1@localhost - reply-59d8df8370b7e95c5a49fbf86aeb2c93@localhost - exchange@microsoft.com]) + reply-59d8df8370b7e95c5a49fbf86aeb2c93@localhost + exchange@microsoft.com]) end end end |