diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-02-22 16:54:59 -0600 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-02-23 09:33:19 -0600 |
| commit | 56de781a2cef437b6e1af748dc0c231af74e044d (patch) | |
| tree | c8186a283904e3cc7461c4289cd2e1a8a9daa69c /spec/features | |
| parent | 1fe7501b49f896b74102c4b970310aa9ae34da85 (diff) | |
| download | gitlab-ce-56de781a2cef437b6e1af748dc0c231af74e044d.tar.gz | |
Revert "Enable Style/DotPosition"
This reverts commit e00fb2bdc2090e9cabeb1eb35a2672a882cc96e9.
# Conflicts:
# .rubocop.yml
# .rubocop_todo.yml
# lib/gitlab/ci/config/entry/global.rb
# lib/gitlab/ci/config/entry/jobs.rb
# spec/lib/gitlab/ci/config/entry/factory_spec.rb
# spec/lib/gitlab/ci/config/entry/global_spec.rb
# spec/lib/gitlab/ci/config/entry/job_spec.rb
# spec/lib/gitlab/ci/status/build/factory_spec.rb
# spec/lib/gitlab/incoming_email_spec.rb
Diffstat (limited to 'spec/features')
| -rw-r--r-- | spec/features/environments_spec.rb | 4 | ||||
| -rw-r--r-- | spec/features/merge_requests/created_from_fork_spec.rb | 4 | ||||
| -rw-r--r-- | spec/features/projects/pipelines/pipelines_spec.rb | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/spec/features/environments_spec.rb b/spec/features/environments_spec.rb index 513de297fdf..78be7d36f47 100644 --- a/spec/features/environments_spec.rb +++ b/spec/features/environments_spec.rb @@ -111,8 +111,8 @@ feature 'Environments page', :feature, :js do find('.js-dropdown-play-icon-container').click expect(page).to have_content(manual.name.humanize) - expect { click_link(manual.name.humanize) }. - not_to change { Ci::Pipeline.count } + expect { click_link(manual.name.humanize) } + .not_to change { Ci::Pipeline.count } expect(manual.reload).to be_pending end diff --git a/spec/features/merge_requests/created_from_fork_spec.rb b/spec/features/merge_requests/created_from_fork_spec.rb index 9fc5339308c..73c5ef31edc 100644 --- a/spec/features/merge_requests/created_from_fork_spec.rb +++ b/spec/features/merge_requests/created_from_fork_spec.rb @@ -61,8 +61,8 @@ feature 'Merge request created from fork' do expect(page).to have_content pipeline.id end - expect(page.find('a.btn-remove')[:href]). - to include fork_project.path_with_namespace + expect(page.find('a.btn-remove')[:href]) + .to include fork_project.path_with_namespace end end diff --git a/spec/features/projects/pipelines/pipelines_spec.rb b/spec/features/projects/pipelines/pipelines_spec.rb index 81f5ebf6339..592dc4483d2 100644 --- a/spec/features/projects/pipelines/pipelines_spec.rb +++ b/spec/features/projects/pipelines/pipelines_spec.rb @@ -366,8 +366,8 @@ describe 'Pipelines', :feature, :js do before { stub_ci_pipeline_to_return_yaml_file } it 'creates a new pipeline' do - expect { click_on 'Create pipeline' }. - to change { Ci::Pipeline.count }.by(1) + expect { click_on 'Create pipeline' } + .to change { Ci::Pipeline.count }.by(1) end end |