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
d78e2052
Commit
d78e2052
authored
Oct 02, 2019
by
Gabriel Mazetto
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move FactoryBot 4.x syntax config to CE
parent
2f9fef78
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
ee/spec/support/factory_bot.rb
ee/spec/support/factory_bot.rb
+0
-4
spec/spec_helper.rb
spec/spec_helper.rb
+4
-0
No files found.
ee/spec/support/factory_bot.rb
View file @
d78e2052
...
@@ -6,9 +6,5 @@ RSpec.configure do |config|
...
@@ -6,9 +6,5 @@ RSpec.configure do |config|
Rails
.
root
.
join
(
'ee'
,
'spec'
,
'factories'
)
Rails
.
root
.
join
(
'ee'
,
'spec'
,
'factories'
)
]
]
FactoryBot
.
find_definitions
FactoryBot
.
find_definitions
# Use FactoryBot 4.x behavior:
# https://github.com/thoughtbot/factory_bot/blob/master/GETTING_STARTED.md#associations
FactoryBot
.
use_parent_strategy
=
false
end
end
end
end
spec/spec_helper.rb
View file @
d78e2052
...
@@ -350,6 +350,10 @@ FactoryBot::SyntaxRunner.class_eval do
...
@@ -350,6 +350,10 @@ FactoryBot::SyntaxRunner.class_eval do
include
RSpec
::
Mocks
::
ExampleMethods
include
RSpec
::
Mocks
::
ExampleMethods
end
end
# Use FactoryBot 4.x behavior:
# https://github.com/thoughtbot/factory_bot/blob/master/GETTING_STARTED.md#associations
FactoryBot
.
use_parent_strategy
=
false
ActiveRecord
::
Migration
.
maintain_test_schema!
ActiveRecord
::
Migration
.
maintain_test_schema!
Shoulda
::
Matchers
.
configure
do
|
config
|
Shoulda
::
Matchers
.
configure
do
|
config
|
...
...
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