aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert2017-08-01 14:38:14 +0200
committerRobert2017-08-01 14:40:50 +0200
commitf899be88e2b476bae67b5b5bfe2f4a1f7458b24e (patch)
treee81efc2bdc95ddfd5852242d9de1001088fcce5a
parent8b748a668c9be125bdff3cf0e2bd0f023fbe7dc5 (diff)
downloadchouette-core-f899be88e2b476bae67b5b5bfe2f4a1f7458b24e.tar.bz2
Refs: #3507@0.3h; CR Step 4
-rw-r--r--app/models/user.rb2
-rw-r--r--spec/factories/import_tasks.rb10
2 files changed, 1 insertions, 11 deletions
diff --git a/app/models/user.rb b/app/models/user.rb
index 7fd8b8cee..eaa75b24e 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -64,7 +64,7 @@ class User < ActiveRecord::Base
def self.portail_api_request
conf = Rails.application.config.try(:stif_portail_api)
- raise 'Rails.application.config.stif_portail_api settings is not defined' unless conf
+ raise 'Rails.application.config.stif_portail_api configuration is not defined' unless conf
HTTPService.get_json_resource(
host: conf[:url],
diff --git a/spec/factories/import_tasks.rb b/spec/factories/import_tasks.rb
deleted file mode 100644
index 9ca6db899..000000000
--- a/spec/factories/import_tasks.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-FactoryGirl.define do
- factory :import_task do |f|
- user_name "dummy"
- user_id 123
- no_save false
- format "Neptune"
- resources { Rack::Test::UploadedFile.new 'spec/fixtures/neptune.zip', 'application/zip', false }
- referential { Referential.find_by_slug("first") }
- end
-end