diff options
| author | Teddy Wing | 2017-08-01 19:08:48 +0200 |
|---|---|---|
| committer | Teddy Wing | 2017-08-01 19:19:01 +0200 |
| commit | aee3eb9f6533e88c817ffde7299b1d22544a8077 (patch) | |
| tree | 90bbcd8a89039bb21455339fe531f40357b54f75 | |
| parent | de687e374fe29a66fcf2d6f32849a5b7a7ef7646 (diff) | |
| download | chouette-core-aee3eb9f6533e88c817ffde7299b1d22544a8077.tar.bz2 | |
Move `workbench_import` factory to its own file
I had started a separate `WorkbenchImport` factory in a separate branch,
but now that I've rebased on Robert's work for #3507, we need to rectify
the doubled `WorkbenchImport` factories. Use Robert's version but move
it to the "workbench_imports.rb" factory file to match the `NetexImport`
factory.
Refs #3511
| -rw-r--r-- | spec/factories/imports.rb | 4 | ||||
| -rw-r--r-- | spec/factories/workbench_imports.rb | 6 |
2 files changed, 1 insertions, 9 deletions
diff --git a/spec/factories/imports.rb b/spec/factories/imports.rb index a59bb5795..afced3b57 100644 --- a/spec/factories/imports.rb +++ b/spec/factories/imports.rb @@ -13,9 +13,5 @@ FactoryGirl.define do after(:build) do |import| import.class.skip_callback(:create, :before, :initialize_fields) end - - factory :workbench_import, class: WorkbenchImport do - file {File.open(Rails.root.join('spec', 'fixtures', 'terminated_job.json'))} - end end end diff --git a/spec/factories/workbench_imports.rb b/spec/factories/workbench_imports.rb index ea582846a..5cdcfd15f 100644 --- a/spec/factories/workbench_imports.rb +++ b/spec/factories/workbench_imports.rb @@ -1,9 +1,5 @@ -# require 'spec/support/file_fixtures' - FactoryGirl.define do - # include FileFixtures - factory :workbench_import, class: WorkbenchImport, parent: :import do - # file { file_fixture('OFFRE_TRANSDEV_2017030112251.zip') } + file { File.open(Rails.root.join('spec', 'fixtures', 'terminated_job.json')) } end end |
