Commit 1f3b410b authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Fix outdated specs that were not executed due to wrong filename

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent bc695e26
...@@ -4,7 +4,7 @@ feature 'Resolve an open discussion in a merge request by creating an issue', fe ...@@ -4,7 +4,7 @@ feature 'Resolve an open discussion in a merge request by creating an issue', fe
let(:user) { create(:user) } let(:user) { create(:user) }
let(:project) { create(:project, only_allow_merge_if_all_discussions_are_resolved: true) } let(:project) { create(:project, only_allow_merge_if_all_discussions_are_resolved: true) }
let(:merge_request) { create(:merge_request, source_project: project) } let(:merge_request) { create(:merge_request, source_project: project) }
let!(:discussion) { Discussion.for_diff_notes([create(:diff_note_on_merge_request, noteable: merge_request, project: project)]).first } let!(:discussion) { create(:diff_note_on_merge_request, noteable: merge_request, project: project).to_discussion }
describe 'As a user with access to the project' do describe 'As a user with access to the project' do
before do before do
...@@ -74,8 +74,8 @@ feature 'Resolve an open discussion in a merge request by creating an issue', fe ...@@ -74,8 +74,8 @@ feature 'Resolve an open discussion in a merge request by creating an issue', fe
it 'Shows a notice to ask someone else to resolve the discussions' do it 'Shows a notice to ask someone else to resolve the discussions' do
expect(page).to have_content("The discussion at #{merge_request.to_reference}"\ expect(page).to have_content("The discussion at #{merge_request.to_reference}"\
"(discussion #{discussion.first_note.id}) will stay unresolved."\ " (discussion #{discussion.first_note.id}) will stay unresolved."\
"Ask someone with permission to resolve it.") " Ask someone with permission to resolve it.")
end end
end end
end end
require 'spec_helper' require 'spec_helper'
describe Gitlab::OtherMarkup, lib: true do describe Gitlab::OtherMarkup, lib: true do
let(:context) { {} }
context "XSS Checks" do context "XSS Checks" do
links = { links = {
'links' => { 'links' => {
file: 'file.rdoc', file: 'file.rdoc',
input: 'XSS[JaVaScriPt:alert(1)]', input: 'XSS[JaVaScriPt:alert(1)]',
output: '<p><a>XSS</a></p>' output: "\n" + '<p><a>XSS</a></p>' + "\n"
} }
} }
links.each do |name, data| links.each do |name, data|
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment