diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-04-24 13:56:43 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-04-24 13:56:43 +0000 |
| commit | 0df0c4c4af42d5d6e6ddf27ab59b72a36ef39fe6 (patch) | |
| tree | 3d2305abcc8255634de92e7584a128bd77141853 /spec/lib | |
| parent | 65152cb3b8a3efeccdf1671f830e308128fd4f9f (diff) | |
| parent | 1f3b410bcf639792b08c6d0c4a1b3499390b55ce (diff) | |
| download | gitlab-ce-0df0c4c4af42d5d6e6ddf27ab59b72a36ef39fe6.tar.gz | |
Merge branch 'dz-fix-spec-filenames-ce' into 'master'
Fix incorrect spec filenames which were ingored by CI
See merge request !10875
Diffstat (limited to 'spec/lib')
| -rw-r--r-- | spec/lib/gitlab/other_markup_spec.rb (renamed from spec/lib/gitlab/other_markup.rb) | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/spec/lib/gitlab/other_markup.rb b/spec/lib/gitlab/other_markup_spec.rb index 8f5a353b381..22e80ec46be 100644 --- a/spec/lib/gitlab/other_markup.rb +++ b/spec/lib/gitlab/other_markup_spec.rb @@ -1,12 +1,14 @@ require 'spec_helper' describe Gitlab::OtherMarkup, lib: true do + let(:context) { {} } + context "XSS Checks" do links = { 'links' => { file: 'file.rdoc', input: 'XSS[JaVaScriPt:alert(1)]', - output: '<p><a>XSS</a></p>' + output: "\n" + '<p><a>XSS</a></p>' + "\n" } } links.each do |name, data| |