Commit 8d6c4b30 authored by Stan Hu's avatar Stan Hu

Merge branch 'fix-markdown-spec' into 'master'

Fix markdown_spec to not use `before(:all)` in order to properly cleanup database after testing



See merge request !4515
parents 53bf9da4 76d61840
...@@ -40,6 +40,7 @@ v 8.9.0 (unreleased) ...@@ -40,6 +40,7 @@ v 8.9.0 (unreleased)
- Cache assigned issue and merge request counts in sidebar nav - Cache assigned issue and merge request counts in sidebar nav
- Use Knapsack only in CI environment - Use Knapsack only in CI environment
- Cache project build count in sidebar nav - Cache project build count in sidebar nav
- Fix markdown_spec to use before instead of before(:all) to properly cleanup database after testing
- Reduce number of queries needed to render issue labels in the sidebar - Reduce number of queries needed to render issue labels in the sidebar
- Improve error handling importing projects - Improve error handling importing projects
- Remove duplicated notification settings - Remove duplicated notification settings
......
...@@ -180,7 +180,7 @@ describe 'GitLab Markdown', feature: true do ...@@ -180,7 +180,7 @@ describe 'GitLab Markdown', feature: true do
end end
end end
before(:all) do before do
@feat = MarkdownFeature.new @feat = MarkdownFeature.new
# `markdown` helper expects a `@project` variable # `markdown` helper expects a `@project` variable
...@@ -188,7 +188,7 @@ describe 'GitLab Markdown', feature: true do ...@@ -188,7 +188,7 @@ describe 'GitLab Markdown', feature: true do
end end
context 'default pipeline' do context 'default pipeline' do
before(:all) do before do
@html = markdown(@feat.raw_markdown) @html = markdown(@feat.raw_markdown)
end end
......
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