diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-03-24 10:20:21 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-03-24 10:20:21 +0000 |
| commit | ffe5ac41b84c342a8b1d099afe116cb1522da8f2 (patch) | |
| tree | fe21b6a9416b5845dabac1a78d9022a3e6816e24 | |
| parent | 4a4a79aa9eb190c44d73dc44f22c88ec5613ac58 (diff) | |
| parent | 2824972c36dae83e630c0c2067a6c21b93ef7d1f (diff) | |
| download | gitlab-ce-ffe5ac41b84c342a8b1d099afe116cb1522da8f2.tar.gz | |
Merge branch 'fix-frontend-specs' into 'master'
Fix specs broken by !3270 and !3337.
To be fair:
- !3270 modifies CSS but `scss-lint` job was allowed to fail in the MR, while not allowed in `master`
- !3337 modifies HTML but the broken test was only in `master` at the time
/cc @alfredo1 @iamphill
See merge request !3378
| -rw-r--r-- | app/assets/stylesheets/pages/profile.scss | 2 | ||||
| -rw-r--r-- | spec/features/issues/update_issues_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/stylesheets/pages/profile.scss b/app/assets/stylesheets/pages/profile.scss index d8c991356af..a9656e5cae7 100644 --- a/app/assets/stylesheets/pages/profile.scss +++ b/app/assets/stylesheets/pages/profile.scss @@ -214,7 +214,7 @@ } .crop-controls { - padding: 10px 0 0 0; + padding: 10px 0 0; text-align: center; } } diff --git a/spec/features/issues/update_issues_spec.rb b/spec/features/issues/update_issues_spec.rb index 121954fabca..3eb903a93fe 100644 --- a/spec/features/issues/update_issues_spec.rb +++ b/spec/features/issues/update_issues_spec.rb @@ -59,7 +59,7 @@ feature 'Multiple issue updating from issues#index', feature: true do find('#check_all_issues').click find('.js-update-assignee').click - find('.dropdown-menu-user-link', text: "Unassigned").click + click_link 'Unassigned' click_update_issues_button within first('.issue .controls') do |