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
This commit is contained in:
Stan Hu 2016-06-08 13:30:19 +00:00
commit 8d6c4b307c
2 changed files with 3 additions and 2 deletions

View File

@ -40,6 +40,7 @@ v 8.9.0 (unreleased)
- Cache assigned issue and merge request counts in sidebar nav
- Use Knapsack only in CI environment
- 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
- Improve error handling importing projects
- Remove duplicated notification settings

View File

@ -180,7 +180,7 @@ describe 'GitLab Markdown', feature: true do
end
end
before(:all) do
before do
@feat = MarkdownFeature.new
# `markdown` helper expects a `@project` variable
@ -188,7 +188,7 @@ describe 'GitLab Markdown', feature: true do
end
context 'default pipeline' do
before(:all) do
before do
@html = markdown(@feat.raw_markdown)
end