diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-08-16 20:36:31 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-08-16 20:36:31 +0000 |
| commit | 86a8409eaf651f84e253307120e31b711c9d6c28 (patch) | |
| tree | 60da9a9f8d23b7f1ae9e86c064aaf22208a735cd /spec | |
| parent | f7e08ad0de580e9f27ad5301542f2913c6bb2bff (diff) | |
| parent | cf33acb32b12cf482e0279043e8cd02131c456e6 (diff) | |
| download | gitlab-ce-86a8409eaf651f84e253307120e31b711c9d6c28.tar.gz | |
Merge branch 'file-content-highlight-line' into 'master'
Highlight empty lines
## What does this MR do?
Rather than just highlight the text, file line highlighting now highlights the full line including empty lines
## What are the relevant issue numbers?
Closes #19484
## Screenshots (if relevant)
See merge request !5092
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/features/projects/files/project_owner_creates_license_file_spec.rb | 4 | ||||
| -rw-r--r-- | spec/features/projects/files/project_owner_sees_link_to_create_license_file_in_empty_project_spec.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/spec/features/projects/files/project_owner_creates_license_file_spec.rb b/spec/features/projects/files/project_owner_creates_license_file_spec.rb index dbd07464444..a521ce50f35 100644 --- a/spec/features/projects/files/project_owner_creates_license_file_spec.rb +++ b/spec/features/projects/files/project_owner_creates_license_file_spec.rb @@ -23,7 +23,7 @@ feature 'project owner creates a license file', feature: true, js: true do select_template('MIT License') - file_content = find('.file-content') + file_content = first('.file-editor') expect(file_content).to have_content('The MIT License (MIT)') expect(file_content).to have_content("Copyright (c) #{Time.now.year} #{project.namespace.human_name}") @@ -47,7 +47,7 @@ feature 'project owner creates a license file', feature: true, js: true do select_template('MIT License') - file_content = find('.file-content') + file_content = first('.file-editor') expect(file_content).to have_content('The MIT License (MIT)') expect(file_content).to have_content("Copyright (c) #{Time.now.year} #{project.namespace.human_name}") diff --git a/spec/features/projects/files/project_owner_sees_link_to_create_license_file_in_empty_project_spec.rb b/spec/features/projects/files/project_owner_sees_link_to_create_license_file_in_empty_project_spec.rb index 45bf0c0d038..4453b6d485f 100644 --- a/spec/features/projects/files/project_owner_sees_link_to_create_license_file_in_empty_project_spec.rb +++ b/spec/features/projects/files/project_owner_sees_link_to_create_license_file_in_empty_project_spec.rb @@ -23,7 +23,7 @@ feature 'project owner sees a link to create a license file in empty project', f select_template('MIT License') - file_content = find('.file-content') + file_content = first('.file-editor') expect(file_content).to have_content('The MIT License (MIT)') expect(file_content).to have_content("Copyright (c) #{Time.now.year} #{project.namespace.human_name}") |