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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
c55c277d
Commit
c55c277d
authored
Feb 14, 2018
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix Spinach setup
Signed-off-by:
Rémy Coutable
<
remy@rymai.me
>
parent
b35084f8
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
3 deletions
+10
-3
features/support/env.rb
features/support/env.rb
+10
-3
spec/support/factory_bot.rb
spec/support/factory_bot.rb
+0
-0
No files found.
features/support/env.rb
View file @
c55c277d
...
@@ -26,17 +26,24 @@ Dir["#{Rails.root}/features/steps/shared/*.rb"].each { |file| require file }
...
@@ -26,17 +26,24 @@ Dir["#{Rails.root}/features/steps/shared/*.rb"].each { |file| require file }
Spinach
.
hooks
.
before_run
do
Spinach
.
hooks
.
before_run
do
include
RSpec
::
Mocks
::
ExampleMethods
include
RSpec
::
Mocks
::
ExampleMethods
include
ActiveJob
::
TestHelper
include
ActiveJob
::
TestHelper
include
FactoryBot
::
Syntax
::
Methods
include
GitlabRoutingHelper
RSpec
::
Mocks
.
setup
RSpec
::
Mocks
.
setup
TestEnv
.
init
(
mailer:
false
)
TestEnv
.
init
(
mailer:
false
)
# EE-specific START
FactoryBot
.
definition_file_paths
=
[
Rails
.
root
.
join
(
'ee'
,
'spec'
,
'factories'
)
]
FactoryBot
.
find_definitions
License
.
destroy_all
License
.
destroy_all
TestLicense
.
init
TestLicense
.
init
# EE-specific END
# skip pre-receive hook check so we can use
# skip pre-receive hook check so we can use
# web editor and merge
# web editor and merge
TestEnv
.
disable_pre_receive
TestEnv
.
disable_pre_receive
include
FactoryBot
::
Syntax
::
Methods
include
GitlabRoutingHelper
end
end
Spinach
.
hooks
.
after_scenario
do
|
scenario_data
,
step_definitions
|
Spinach
.
hooks
.
after_scenario
do
|
scenario_data
,
step_definitions
|
...
...
spec/support/factory_
girl
.rb
→
spec/support/factory_
bot
.rb
View file @
c55c277d
File moved
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