diff options
author | Alfredo Sumaran <alfredo@gitlab.com> | 2016-04-22 16:37:15 +0300 |
---|---|---|
committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-04-22 16:37:15 +0300 |
commit | 21a1e1567784809b8773bb7c48ae33a1a42f73dc (patch) | |
tree | a67e3bbae2e87dbec3278b2db872ac95ea17c784 /spec/features | |
parent | e0c07b5e3d1e14fa6efda3c13db46477d79c7c34 (diff) | |
parent | d5398e9656c1174d4d5be5a8cdad2a26d7587a27 (diff) |
Merge remote-tracking branch 'origin/master' into issue_3799
Diffstat (limited to 'spec/features')
-rw-r--r-- | spec/features/issues_spec.rb | 13 | ||||
-rw-r--r-- | spec/features/markdown_spec.rb | 7 | ||||
-rw-r--r-- | spec/features/signup_spec.rb | 4 |
3 files changed, 21 insertions, 3 deletions
diff --git a/spec/features/issues_spec.rb b/spec/features/issues_spec.rb index 90476ab369b..b1d49875ac4 100644 --- a/spec/features/issues_spec.rb +++ b/spec/features/issues_spec.rb @@ -178,6 +178,19 @@ describe 'Issues', feature: true do expect(first_issue).to include('foo') end + + context 'with a filter on labels' do + let(:label) { create(:label, project: project) } + before { create(:label_link, label: label, target: foo) } + + it 'sorts by least recently due date by excluding nil due dates' do + bar.update(due_date: nil) + + visit namespace_project_issues_path(project.namespace, project, label_names: [label.name], sort: sort_value_due_date_later) + + expect(first_issue).to include('foo') + end + end end describe 'filtering by due date' do diff --git a/spec/features/markdown_spec.rb b/spec/features/markdown_spec.rb index 3d0d0e59fd7..0148c87084a 100644 --- a/spec/features/markdown_spec.rb +++ b/spec/features/markdown_spec.rb @@ -165,7 +165,12 @@ describe 'GitLab Markdown', feature: true do describe 'ExternalLinkFilter' do it 'adds nofollow to external link' do link = doc.at_css('a:contains("Google")') - expect(link.attr('rel')).to match 'nofollow' + expect(link.attr('rel')).to include('nofollow') + end + + it 'adds noreferrer to external link' do + link = doc.at_css('a:contains("Google")') + expect(link.attr('rel')).to include('noreferrer') end it 'ignores internal link' do diff --git a/spec/features/signup_spec.rb b/spec/features/signup_spec.rb index 01472743b2a..51b754ff85c 100644 --- a/spec/features/signup_spec.rb +++ b/spec/features/signup_spec.rb @@ -13,8 +13,8 @@ feature 'Signup', feature: true do fill_in 'user_password_sign_up', with: user.password click_button "Sign up" - expect(current_path).to eq user_session_path - expect(page).to have_content("A message with a confirmation link has been sent to your email address.") + expect(current_path).to eq users_almost_there_path + expect(page).to have_content("Please check your email to confirm your account") end end |