Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
8c957b54
Commit
8c957b54
authored
Jul 28, 2015
by
Robert Speicher
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix setup/teardown for Markdown feature spec
Prior, CI seemed to be freezing after running these specs.
parent
05f9a6a9
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
24 deletions
+9
-24
spec/features/markdown_spec.rb
spec/features/markdown_spec.rb
+9
-16
spec/support/markdown_feature.rb
spec/support/markdown_feature.rb
+0
-8
No files found.
spec/features/markdown_spec.rb
View file @
8c957b54
...
@@ -29,22 +29,6 @@ describe 'GitLab Markdown', feature: true do
...
@@ -29,22 +29,6 @@ describe 'GitLab Markdown', feature: true do
include
GitlabMarkdownHelper
include
GitlabMarkdownHelper
include
MarkdownMatchers
include
MarkdownMatchers
# Let's only parse this thing once
before
(
:all
)
do
@feat
=
MarkdownFeature
.
new
# `gfm_with_options` depends on a `@project` variable
@project
=
@feat
.
project
end
after
(
:all
)
do
@feat
.
teardown
end
def
doc
(
html
=
@html
)
Nokogiri
::
HTML
::
DocumentFragment
.
parse
(
html
)
end
# Sometimes it can be useful to see the parsed output of the Markdown document
# Sometimes it can be useful to see the parsed output of the Markdown document
# for debugging. Call this method to write the output to
# for debugging. Call this method to write the output to
# `tmp/capybara/<filename>.html`.
# `tmp/capybara/<filename>.html`.
...
@@ -54,6 +38,10 @@ describe 'GitLab Markdown', feature: true do
...
@@ -54,6 +38,10 @@ describe 'GitLab Markdown', feature: true do
end
end
end
end
def
doc
(
html
=
@html
)
Nokogiri
::
HTML
::
DocumentFragment
.
parse
(
html
)
end
# Shared behavior that all pipelines should exhibit
# Shared behavior that all pipelines should exhibit
shared_examples
'all pipelines'
do
shared_examples
'all pipelines'
do
describe
'Redcarpet extensions'
do
describe
'Redcarpet extensions'
do
...
@@ -189,6 +177,11 @@ describe 'GitLab Markdown', feature: true do
...
@@ -189,6 +177,11 @@ describe 'GitLab Markdown', feature: true do
context
'default pipeline'
do
context
'default pipeline'
do
before
(
:all
)
do
before
(
:all
)
do
@feat
=
MarkdownFeature
.
new
# `gfm_with_options` depends on a `@project` variable
@project
=
@feat
.
project
@html
=
markdown
(
@feat
.
raw_markdown
)
@html
=
markdown
(
@feat
.
raw_markdown
)
end
end
...
...
spec/support/markdown_feature.rb
View file @
8c957b54
...
@@ -10,14 +10,6 @@
...
@@ -10,14 +10,6 @@
class
MarkdownFeature
class
MarkdownFeature
include
FactoryGirl
::
Syntax
::
Methods
include
FactoryGirl
::
Syntax
::
Methods
def
initialize
DatabaseCleaner
.
start
end
def
teardown
DatabaseCleaner
.
clean
end
def
user
def
user
@user
||=
create
(
:user
)
@user
||=
create
(
:user
)
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment