aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--app/models/import.rb2
-rw-r--r--config/initializers/apartment.rb57
-rw-r--r--spec/factories/imports.rb4
-rw-r--r--spec/models/workbench_import_spec.rb12
4 files changed, 46 insertions, 29 deletions
diff --git a/app/models/import.rb b/app/models/import.rb
index d0736ab0b..1a5062e2a 100644
--- a/app/models/import.rb
+++ b/app/models/import.rb
@@ -4,7 +4,7 @@ class Import < ActiveRecord::Base
belongs_to :referential
extend Enumerize
- enumerize :status, in: %i(new pending successful failed running aborted canceled)
+ enumerize :status, in: %i(new downloading analyzing pending successful failed running aborted canceled)
validates :file, presence: true
diff --git a/config/initializers/apartment.rb b/config/initializers/apartment.rb
index 29ce6564f..e1e86449c 100644
--- a/config/initializers/apartment.rb
+++ b/config/initializers/apartment.rb
@@ -18,34 +18,35 @@ Apartment.configure do |config|
# config.excluded_models = %w{Tenant}
#
config.excluded_models = [
- "Referential",
- "ReferentialMetadata",
- "Organisation",
- "User",
- "Api::V1::ApiKey",
- "RuleParameterSet",
- "StopAreaReferential",
- "StopAreaReferentialMembership",
- "StopAreaReferentialSync",
- "StopAreaReferentialSyncMessage",
- "Chouette::StopArea",
- "LineReferential",
- "LineReferentialMembership",
- "LineReferentialSync",
- "LineReferentialSyncMessage",
- "Chouette::Line",
- "Chouette::GroupOfLine",
- "Chouette::Company",
- "Chouette::Network",
- "ReferentialCloning",
- "Workbench",
- "CleanUp",
- "CleanUpResult",
- "Calendar",
- "Import",
- "NetexImport",
- "ImportMessage",
- "ImportResource"
+ 'Referential',
+ 'ReferentialMetadata',
+ 'Organisation',
+ 'User',
+ 'Api::V1::ApiKey',
+ 'RuleParameterSet',
+ 'StopAreaReferential',
+ 'StopAreaReferentialMembership',
+ 'StopAreaReferentialSync',
+ 'StopAreaReferentialSyncMessage',
+ 'Chouette::StopArea',
+ 'LineReferential',
+ 'LineReferentialMembership',
+ 'LineReferentialSync',
+ 'LineReferentialSyncMessage',
+ 'Chouette::Line',
+ 'Chouette::GroupOfLine',
+ 'Chouette::Company',
+ 'Chouette::Network',
+ 'ReferentialCloning',
+ 'Workbench',
+ 'CleanUp',
+ 'CleanUpResult',
+ 'Calendar',
+ 'Import',
+ 'NetexImport',
+ 'WorkbenchImport',
+ 'ImportMessage',
+ 'ImportResource'
]
# use postgres schemas?
diff --git a/spec/factories/imports.rb b/spec/factories/imports.rb
index fc8668606..6db4b6b5f 100644
--- a/spec/factories/imports.rb
+++ b/spec/factories/imports.rb
@@ -9,5 +9,9 @@ FactoryGirl.define do
status :new
started_at nil
ended_at nil
+
+ factory :workbench_import do
+ type 'WorkbenchImport'
+ end
end
end
diff --git a/spec/models/workbench_import_spec.rb b/spec/models/workbench_import_spec.rb
new file mode 100644
index 000000000..629973dca
--- /dev/null
+++ b/spec/models/workbench_import_spec.rb
@@ -0,0 +1,12 @@
+RSpec.describe WorkbenchImport do
+ let( :workbench_import ){ build_stubbed :workbench_import }
+
+ it 'is valid' do
+ expect( workbench_import ).to be_valid
+ end
+
+ it 'or not...' do
+ expect( build_stubbed :workbench_import, status: 'what?' ).not_to be_valid
+ end
+
+end