From dde92a85dfcc23a029c95d2b22a7976dac91ea63 Mon Sep 17 00:00:00 2001 From: Thorsten Eckel Date: Mon, 27 Mar 2017 11:25:45 +0200 Subject: [PATCH] Improved rspec folder structure for better scalability in the future. --- spec/{ => lib}/auth/internal_spec.rb | 0 spec/{ => lib}/external_sync_spec.rb | 0 spec/{ => lib}/import/async_examples.rb | 0 spec/{ => lib}/import/base_factory_examples.rb | 2 +- spec/{ => lib}/import/base_factory_spec.rb | 2 +- spec/{ => lib}/import/base_resource_spec.rb | 0 spec/{ => lib}/import/factory_examples.rb | 2 +- spec/{ => lib}/import/factory_spec.rb | 2 +- spec/{ => lib}/import/helper_examples.rb | 0 spec/{ => lib}/import/helper_spec.rb | 2 +- spec/{ => lib}/import/import_factory_examples.rb | 0 spec/{ => lib}/import/import_stats_examples.rb | 0 spec/{ => lib}/import/importer_examples.rb | 0 spec/{ => lib}/import/model_resource_spec.rb | 0 .../otrs/article/attachment_factory_spec.rb | 2 +- .../import/otrs/article_customer_factory_spec.rb | 2 +- .../import/otrs/article_customer_sepc.rb | 0 .../{ => lib}/import/otrs/article_factory_spec.rb | 2 +- spec/{ => lib}/import/otrs/article_spec.rb | 0 .../import/otrs/customer_factory_spec.rb | 2 +- spec/{ => lib}/import/otrs/customer_spec.rb | 0 .../import/otrs/customer_user_factory_spec.rb | 2 +- spec/{ => lib}/import/otrs/customer_user_spec.rb | 0 spec/{ => lib}/import/otrs/diff_examples.rb | 0 .../import/otrs/dynamic_field/checkbox_spec.rb | 2 +- .../import/otrs/dynamic_field/date_spec.rb | 2 +- .../import/otrs/dynamic_field/date_time_spec.rb | 2 +- .../import/otrs/dynamic_field/dropdown_spec.rb | 2 +- .../import/otrs/dynamic_field/multiselect_spec.rb | 2 +- .../import/otrs/dynamic_field/text_area_spec.rb | 2 +- .../import/otrs/dynamic_field/text_spec.rb | 2 +- .../import/otrs/dynamic_field_examples.rb | 0 .../import/otrs/dynamic_field_factory_spec.rb | 4 ++-- spec/{ => lib}/import/otrs/dynamic_field_spec.rb | 2 +- .../{ => lib}/import/otrs/history/article_spec.rb | 2 +- spec/{ => lib}/import/otrs/history/move_spec.rb | 2 +- .../import/otrs/history/new_ticket_spec.rb | 2 +- .../import/otrs/history/priority_update_spec.rb | 2 +- .../import/otrs/history/state_update_spec.rb | 2 +- spec/{ => lib}/import/otrs/history_examples.rb | 0 .../{ => lib}/import/otrs/history_factory_spec.rb | 2 +- spec/{ => lib}/import/otrs/history_spec.rb | 2 +- .../import/otrs/priority_factory_spec.rb | 2 +- spec/{ => lib}/import/otrs/priority_spec.rb | 0 spec/{ => lib}/import/otrs/queue_factory_spec.rb | 2 +- spec/{ => lib}/import/otrs/queue_spec.rb | 0 spec/{ => lib}/import/otrs/requester_spec.rb | 0 spec/{ => lib}/import/otrs/state_factory_spec.rb | 2 +- spec/{ => lib}/import/otrs/state_spec.rb | 0 .../import/otrs/sys_config_factory_spec.rb | 2 +- spec/{ => lib}/import/otrs/ticket_factory_spec.rb | 2 +- spec/{ => lib}/import/otrs/ticket_spec.rb | 0 spec/{ => lib}/import/otrs/user_factory_spec.rb | 2 +- spec/{ => lib}/import/otrs/user_spec.rb | 0 spec/{ => lib}/import/otrs_spec.rb | 10 +++++----- .../import/transaction_factory_examples.rb | 2 +- spec/{ => lib}/import/transaction_factory_spec.rb | 2 +- .../import/zendesk/base_factory_examples.rb | 2 +- .../{ => lib}/import/zendesk/base_factory_spec.rb | 2 +- .../import/zendesk/group_factory_spec.rb | 4 ++-- spec/{ => lib}/import/zendesk/group_spec.rb | 0 .../zendesk/local_id_mapper_hook_examples.rb | 0 .../import/zendesk/local_id_mapper_hook_spec.rb | 2 +- .../import/zendesk/lookup_backend_examples.rb | 0 .../zendesk/object_attribute/checkbox_spec.rb | 0 .../import/zendesk/object_attribute/date_spec.rb | 0 .../zendesk/object_attribute/decimal_spec.rb | 0 .../zendesk/object_attribute/dropdown_spec.rb | 0 .../zendesk/object_attribute/integer_spec.rb | 0 .../zendesk/object_attribute/regexp_spec.rb | 0 .../zendesk/object_attribute/tagger_spec.rb | 0 .../import/zendesk/object_attribute/text_spec.rb | 0 .../zendesk/object_attribute/textarea_spec.rb | 0 .../import/zendesk/object_attribute_spec.rb | 0 .../import/zendesk/object_field_examples.rb | 0 .../{ => lib}/import/zendesk/object_field_spec.rb | 2 +- .../import/zendesk/organization_factory_spec.rb | 4 ++-- .../zendesk/organization_field_factory_spec.rb | 4 ++-- .../import/zendesk/organization_field_spec.rb | 2 +- .../{ => lib}/import/zendesk/organization_spec.rb | 0 spec/{ => lib}/import/zendesk/priority_spec.rb | 2 +- spec/{ => lib}/import/zendesk/state_spec.rb | 2 +- .../ticket/comment/attachment_factory_spec.rb | 2 +- .../zendesk/ticket/comment/attachment_spec.rb | 0 .../comment/local_id_lookup_backend_examples.rb | 0 .../import/zendesk/ticket/comment/sender_spec.rb | 2 +- .../import/zendesk/ticket/comment/type_spec.rb | 2 +- .../import/zendesk/ticket/comment_factory_spec.rb | 2 +- .../import/zendesk/ticket/comment_spec.rb | 0 .../zendesk/ticket/sub_object_factory_examples.rb | 2 +- .../import/zendesk/ticket/tag_factory_spec.rb | 2 +- spec/{ => lib}/import/zendesk/ticket/tag_spec.rb | 0 .../import/zendesk/ticket_factory_spec.rb | 2 +- .../import/zendesk/ticket_field_factory_spec.rb | 4 ++-- .../{ => lib}/import/zendesk/ticket_field_spec.rb | 2 +- spec/{ => lib}/import/zendesk/ticket_spec.rb | 0 spec/{ => lib}/import/zendesk/user/group_spec.rb | 2 +- .../zendesk/user/lookup_backend_examples.rb | 0 spec/{ => lib}/import/zendesk/user/role_spec.rb | 2 +- .../{ => lib}/import/zendesk/user_factory_spec.rb | 4 ++-- .../import/zendesk/user_field_factory_spec.rb | 4 ++-- spec/{ => lib}/import/zendesk/user_field_spec.rb | 2 +- spec/{ => lib}/import/zendesk/user_spec.rb | 0 spec/{ => lib}/import/zendesk_spec.rb | 8 ++++---- spec/{ => lib}/password_hash_spec.rb | 0 spec/rails_helper.rb | 15 +++++++++++++-- spec/spec_helper.rb | 15 --------------- spec/spec_helper/zammad_helper.rb | 1 - .../json.rb => support/json_fixture.rb} | 0 109 files changed, 87 insertions(+), 92 deletions(-) rename spec/{ => lib}/auth/internal_spec.rb (100%) rename spec/{ => lib}/external_sync_spec.rb (100%) rename spec/{ => lib}/import/async_examples.rb (100%) rename spec/{ => lib}/import/base_factory_examples.rb (94%) rename spec/{ => lib}/import/base_factory_spec.rb (72%) rename spec/{ => lib}/import/base_resource_spec.rb (100%) rename spec/{ => lib}/import/factory_examples.rb (67%) rename spec/{ => lib}/import/factory_spec.rb (79%) rename spec/{ => lib}/import/helper_examples.rb (100%) rename spec/{ => lib}/import/helper_spec.rb (93%) rename spec/{ => lib}/import/import_factory_examples.rb (100%) rename spec/{ => lib}/import/import_stats_examples.rb (100%) rename spec/{ => lib}/import/importer_examples.rb (100%) rename spec/{ => lib}/import/model_resource_spec.rb (100%) rename spec/{ => lib}/import/otrs/article/attachment_factory_spec.rb (97%) rename spec/{ => lib}/import/otrs/article_customer_factory_spec.rb (75%) rename spec/{ => lib}/import/otrs/article_customer_sepc.rb (100%) rename spec/{ => lib}/import/otrs/article_factory_spec.rb (74%) rename spec/{ => lib}/import/otrs/article_spec.rb (100%) rename spec/{ => lib}/import/otrs/customer_factory_spec.rb (74%) rename spec/{ => lib}/import/otrs/customer_spec.rb (100%) rename spec/{ => lib}/import/otrs/customer_user_factory_spec.rb (75%) rename spec/{ => lib}/import/otrs/customer_user_spec.rb (100%) rename spec/{ => lib}/import/otrs/diff_examples.rb (100%) rename spec/{ => lib}/import/otrs/dynamic_field/checkbox_spec.rb (94%) rename spec/{ => lib}/import/otrs/dynamic_field/date_spec.rb (95%) rename spec/{ => lib}/import/otrs/dynamic_field/date_time_spec.rb (95%) rename spec/{ => lib}/import/otrs/dynamic_field/dropdown_spec.rb (95%) rename spec/{ => lib}/import/otrs/dynamic_field/multiselect_spec.rb (95%) rename spec/{ => lib}/import/otrs/dynamic_field/text_area_spec.rb (93%) rename spec/{ => lib}/import/otrs/dynamic_field/text_spec.rb (93%) rename spec/{ => lib}/import/otrs/dynamic_field_examples.rb (100%) rename spec/{ => lib}/import/otrs/dynamic_field_factory_spec.rb (88%) rename spec/{ => lib}/import/otrs/dynamic_field_spec.rb (90%) rename spec/{ => lib}/import/otrs/history/article_spec.rb (93%) rename spec/{ => lib}/import/otrs/history/move_spec.rb (93%) rename spec/{ => lib}/import/otrs/history/new_ticket_spec.rb (91%) rename spec/{ => lib}/import/otrs/history/priority_update_spec.rb (93%) rename spec/{ => lib}/import/otrs/history/state_update_spec.rb (93%) rename spec/{ => lib}/import/otrs/history_examples.rb (100%) rename spec/{ => lib}/import/otrs/history_factory_spec.rb (74%) rename spec/{ => lib}/import/otrs/history_spec.rb (88%) rename spec/{ => lib}/import/otrs/priority_factory_spec.rb (96%) rename spec/{ => lib}/import/otrs/priority_spec.rb (100%) rename spec/{ => lib}/import/otrs/queue_factory_spec.rb (74%) rename spec/{ => lib}/import/otrs/queue_spec.rb (100%) rename spec/{ => lib}/import/otrs/requester_spec.rb (100%) rename spec/{ => lib}/import/otrs/state_factory_spec.rb (98%) rename spec/{ => lib}/import/otrs/state_spec.rb (100%) rename spec/{ => lib}/import/otrs/sys_config_factory_spec.rb (90%) rename spec/{ => lib}/import/otrs/ticket_factory_spec.rb (74%) rename spec/{ => lib}/import/otrs/ticket_spec.rb (100%) rename spec/{ => lib}/import/otrs/user_factory_spec.rb (88%) rename spec/{ => lib}/import/otrs/user_spec.rb (100%) rename spec/{ => lib}/import/otrs_spec.rb (55%) rename spec/{ => lib}/import/transaction_factory_examples.rb (69%) rename spec/{ => lib}/import/transaction_factory_spec.rb (77%) rename spec/{ => lib}/import/zendesk/base_factory_examples.rb (95%) rename spec/{ => lib}/import/zendesk/base_factory_spec.rb (70%) rename spec/{ => lib}/import/zendesk/group_factory_spec.rb (62%) rename spec/{ => lib}/import/zendesk/group_spec.rb (100%) rename spec/{ => lib}/import/zendesk/local_id_mapper_hook_examples.rb (100%) rename spec/{ => lib}/import/zendesk/local_id_mapper_hook_spec.rb (69%) rename spec/{ => lib}/import/zendesk/lookup_backend_examples.rb (100%) rename spec/{ => lib}/import/zendesk/object_attribute/checkbox_spec.rb (100%) rename spec/{ => lib}/import/zendesk/object_attribute/date_spec.rb (100%) rename spec/{ => lib}/import/zendesk/object_attribute/decimal_spec.rb (100%) rename spec/{ => lib}/import/zendesk/object_attribute/dropdown_spec.rb (100%) rename spec/{ => lib}/import/zendesk/object_attribute/integer_spec.rb (100%) rename spec/{ => lib}/import/zendesk/object_attribute/regexp_spec.rb (100%) rename spec/{ => lib}/import/zendesk/object_attribute/tagger_spec.rb (100%) rename spec/{ => lib}/import/zendesk/object_attribute/text_spec.rb (100%) rename spec/{ => lib}/import/zendesk/object_attribute/textarea_spec.rb (100%) rename spec/{ => lib}/import/zendesk/object_attribute_spec.rb (100%) rename spec/{ => lib}/import/zendesk/object_field_examples.rb (100%) rename spec/{ => lib}/import/zendesk/object_field_spec.rb (70%) rename spec/{ => lib}/import/zendesk/organization_factory_spec.rb (64%) rename spec/{ => lib}/import/zendesk/organization_field_factory_spec.rb (63%) rename spec/{ => lib}/import/zendesk/organization_field_spec.rb (71%) rename spec/{ => lib}/import/zendesk/organization_spec.rb (100%) rename spec/{ => lib}/import/zendesk/priority_spec.rb (87%) rename spec/{ => lib}/import/zendesk/state_spec.rb (86%) rename spec/{ => lib}/import/zendesk/ticket/comment/attachment_factory_spec.rb (94%) rename spec/{ => lib}/import/zendesk/ticket/comment/attachment_spec.rb (100%) rename spec/{ => lib}/import/zendesk/ticket/comment/local_id_lookup_backend_examples.rb (100%) rename spec/{ => lib}/import/zendesk/ticket/comment/sender_spec.rb (62%) rename spec/{ => lib}/import/zendesk/ticket/comment/type_spec.rb (62%) rename spec/{ => lib}/import/zendesk/ticket/comment_factory_spec.rb (69%) rename spec/{ => lib}/import/zendesk/ticket/comment_spec.rb (100%) rename spec/{ => lib}/import/zendesk/ticket/sub_object_factory_examples.rb (95%) rename spec/{ => lib}/import/zendesk/ticket/tag_factory_spec.rb (69%) rename spec/{ => lib}/import/zendesk/ticket/tag_spec.rb (100%) rename spec/{ => lib}/import/zendesk/ticket_factory_spec.rb (71%) rename spec/{ => lib}/import/zendesk/ticket_field_factory_spec.rb (62%) rename spec/{ => lib}/import/zendesk/ticket_field_spec.rb (70%) rename spec/{ => lib}/import/zendesk/ticket_spec.rb (100%) rename spec/{ => lib}/import/zendesk/user/group_spec.rb (77%) rename spec/{ => lib}/import/zendesk/user/lookup_backend_examples.rb (100%) rename spec/{ => lib}/import/zendesk/user/role_spec.rb (82%) rename spec/{ => lib}/import/zendesk/user_factory_spec.rb (61%) rename spec/{ => lib}/import/zendesk/user_field_factory_spec.rb (62%) rename spec/{ => lib}/import/zendesk/user_field_spec.rb (70%) rename spec/{ => lib}/import/zendesk/user_spec.rb (100%) rename spec/{ => lib}/import/zendesk_spec.rb (57%) rename spec/{ => lib}/password_hash_spec.rb (100%) delete mode 100644 spec/spec_helper/zammad_helper.rb rename spec/{spec_helper/zammad_helper/json.rb => support/json_fixture.rb} (100%) diff --git a/spec/auth/internal_spec.rb b/spec/lib/auth/internal_spec.rb similarity index 100% rename from spec/auth/internal_spec.rb rename to spec/lib/auth/internal_spec.rb diff --git a/spec/external_sync_spec.rb b/spec/lib/external_sync_spec.rb similarity index 100% rename from spec/external_sync_spec.rb rename to spec/lib/external_sync_spec.rb diff --git a/spec/import/async_examples.rb b/spec/lib/import/async_examples.rb similarity index 100% rename from spec/import/async_examples.rb rename to spec/lib/import/async_examples.rb diff --git a/spec/import/base_factory_examples.rb b/spec/lib/import/base_factory_examples.rb similarity index 94% rename from spec/import/base_factory_examples.rb rename to spec/lib/import/base_factory_examples.rb index 173644dcc..19213cf82 100644 --- a/spec/import/base_factory_examples.rb +++ b/spec/lib/import/base_factory_examples.rb @@ -1,4 +1,4 @@ -require 'import/import_factory_examples' +require 'lib/import/import_factory_examples' RSpec.shared_examples 'Import::BaseFactory' do it_behaves_like 'Import factory' diff --git a/spec/import/base_factory_spec.rb b/spec/lib/import/base_factory_spec.rb similarity index 72% rename from spec/import/base_factory_spec.rb rename to spec/lib/import/base_factory_spec.rb index 39462d826..2d0d4375e 100644 --- a/spec/import/base_factory_spec.rb +++ b/spec/lib/import/base_factory_spec.rb @@ -1,5 +1,5 @@ require 'rails_helper' -require 'import/factory_examples' +require 'lib/import/factory_examples' RSpec.describe Import::Factory do it_behaves_like 'Import::Factory' diff --git a/spec/import/base_resource_spec.rb b/spec/lib/import/base_resource_spec.rb similarity index 100% rename from spec/import/base_resource_spec.rb rename to spec/lib/import/base_resource_spec.rb diff --git a/spec/import/factory_examples.rb b/spec/lib/import/factory_examples.rb similarity index 67% rename from spec/import/factory_examples.rb rename to spec/lib/import/factory_examples.rb index ef43fb1a9..514647475 100644 --- a/spec/import/factory_examples.rb +++ b/spec/lib/import/factory_examples.rb @@ -1,4 +1,4 @@ -require 'import/base_factory_examples' +require 'lib/import/base_factory_examples' RSpec.shared_examples 'Import::Factory' do it_behaves_like 'Import::BaseFactory' diff --git a/spec/import/factory_spec.rb b/spec/lib/import/factory_spec.rb similarity index 79% rename from spec/import/factory_spec.rb rename to spec/lib/import/factory_spec.rb index 397a035bd..f681dd3cf 100644 --- a/spec/import/factory_spec.rb +++ b/spec/lib/import/factory_spec.rb @@ -1,5 +1,5 @@ require 'rails_helper' -require 'import/factory_examples' +require 'lib/import/factory_examples' RSpec.describe Import::Factory do it_behaves_like 'Import::Factory' diff --git a/spec/import/helper_examples.rb b/spec/lib/import/helper_examples.rb similarity index 100% rename from spec/import/helper_examples.rb rename to spec/lib/import/helper_examples.rb diff --git a/spec/import/helper_spec.rb b/spec/lib/import/helper_spec.rb similarity index 93% rename from spec/import/helper_spec.rb rename to spec/lib/import/helper_spec.rb index 4194c3470..78ea79db8 100644 --- a/spec/import/helper_spec.rb +++ b/spec/lib/import/helper_spec.rb @@ -1,5 +1,5 @@ require 'rails_helper' -require 'import/helper_examples' +require 'lib/import/helper_examples' RSpec.describe Import::Helper do it_behaves_like 'Import::Helper' diff --git a/spec/import/import_factory_examples.rb b/spec/lib/import/import_factory_examples.rb similarity index 100% rename from spec/import/import_factory_examples.rb rename to spec/lib/import/import_factory_examples.rb diff --git a/spec/import/import_stats_examples.rb b/spec/lib/import/import_stats_examples.rb similarity index 100% rename from spec/import/import_stats_examples.rb rename to spec/lib/import/import_stats_examples.rb diff --git a/spec/import/importer_examples.rb b/spec/lib/import/importer_examples.rb similarity index 100% rename from spec/import/importer_examples.rb rename to spec/lib/import/importer_examples.rb diff --git a/spec/import/model_resource_spec.rb b/spec/lib/import/model_resource_spec.rb similarity index 100% rename from spec/import/model_resource_spec.rb rename to spec/lib/import/model_resource_spec.rb diff --git a/spec/import/otrs/article/attachment_factory_spec.rb b/spec/lib/import/otrs/article/attachment_factory_spec.rb similarity index 97% rename from spec/import/otrs/article/attachment_factory_spec.rb rename to spec/lib/import/otrs/article/attachment_factory_spec.rb index 1d5047685..413d0cac9 100644 --- a/spec/import/otrs/article/attachment_factory_spec.rb +++ b/spec/lib/import/otrs/article/attachment_factory_spec.rb @@ -1,5 +1,5 @@ require 'rails_helper' -require 'import/import_factory_examples' +require 'lib/import/import_factory_examples' RSpec.describe Import::OTRS::Article::AttachmentFactory do it_behaves_like 'Import factory' diff --git a/spec/import/otrs/article_customer_factory_spec.rb b/spec/lib/import/otrs/article_customer_factory_spec.rb similarity index 75% rename from spec/import/otrs/article_customer_factory_spec.rb rename to spec/lib/import/otrs/article_customer_factory_spec.rb index 69cc180b8..3bd11b7b0 100644 --- a/spec/import/otrs/article_customer_factory_spec.rb +++ b/spec/lib/import/otrs/article_customer_factory_spec.rb @@ -1,5 +1,5 @@ require 'rails_helper' -require 'import/factory_examples' +require 'lib/import/factory_examples' RSpec.describe Import::OTRS::ArticleCustomerFactory do it_behaves_like 'Import::Factory' diff --git a/spec/import/otrs/article_customer_sepc.rb b/spec/lib/import/otrs/article_customer_sepc.rb similarity index 100% rename from spec/import/otrs/article_customer_sepc.rb rename to spec/lib/import/otrs/article_customer_sepc.rb diff --git a/spec/import/otrs/article_factory_spec.rb b/spec/lib/import/otrs/article_factory_spec.rb similarity index 74% rename from spec/import/otrs/article_factory_spec.rb rename to spec/lib/import/otrs/article_factory_spec.rb index f6a943228..0b7b577e9 100644 --- a/spec/import/otrs/article_factory_spec.rb +++ b/spec/lib/import/otrs/article_factory_spec.rb @@ -1,5 +1,5 @@ require 'rails_helper' -require 'import/factory_examples' +require 'lib/import/factory_examples' RSpec.describe Import::OTRS::ArticleFactory do it_behaves_like 'Import::Factory' diff --git a/spec/import/otrs/article_spec.rb b/spec/lib/import/otrs/article_spec.rb similarity index 100% rename from spec/import/otrs/article_spec.rb rename to spec/lib/import/otrs/article_spec.rb diff --git a/spec/import/otrs/customer_factory_spec.rb b/spec/lib/import/otrs/customer_factory_spec.rb similarity index 74% rename from spec/import/otrs/customer_factory_spec.rb rename to spec/lib/import/otrs/customer_factory_spec.rb index 40298e1c8..f3227cf06 100644 --- a/spec/import/otrs/customer_factory_spec.rb +++ b/spec/lib/import/otrs/customer_factory_spec.rb @@ -1,5 +1,5 @@ require 'rails_helper' -require 'import/factory_examples' +require 'lib/import/factory_examples' RSpec.describe Import::OTRS::CustomerFactory do it_behaves_like 'Import::Factory' diff --git a/spec/import/otrs/customer_spec.rb b/spec/lib/import/otrs/customer_spec.rb similarity index 100% rename from spec/import/otrs/customer_spec.rb rename to spec/lib/import/otrs/customer_spec.rb diff --git a/spec/import/otrs/customer_user_factory_spec.rb b/spec/lib/import/otrs/customer_user_factory_spec.rb similarity index 75% rename from spec/import/otrs/customer_user_factory_spec.rb rename to spec/lib/import/otrs/customer_user_factory_spec.rb index bb0761d52..5fbdb2184 100644 --- a/spec/import/otrs/customer_user_factory_spec.rb +++ b/spec/lib/import/otrs/customer_user_factory_spec.rb @@ -1,5 +1,5 @@ require 'rails_helper' -require 'import/factory_examples' +require 'lib/import/factory_examples' RSpec.describe Import::OTRS::CustomerUserFactory do it_behaves_like 'Import::Factory' diff --git a/spec/import/otrs/customer_user_spec.rb b/spec/lib/import/otrs/customer_user_spec.rb similarity index 100% rename from spec/import/otrs/customer_user_spec.rb rename to spec/lib/import/otrs/customer_user_spec.rb diff --git a/spec/import/otrs/diff_examples.rb b/spec/lib/import/otrs/diff_examples.rb similarity index 100% rename from spec/import/otrs/diff_examples.rb rename to spec/lib/import/otrs/diff_examples.rb diff --git a/spec/import/otrs/dynamic_field/checkbox_spec.rb b/spec/lib/import/otrs/dynamic_field/checkbox_spec.rb similarity index 94% rename from spec/import/otrs/dynamic_field/checkbox_spec.rb rename to spec/lib/import/otrs/dynamic_field/checkbox_spec.rb index 61872b7d0..658467d92 100644 --- a/spec/import/otrs/dynamic_field/checkbox_spec.rb +++ b/spec/lib/import/otrs/dynamic_field/checkbox_spec.rb @@ -1,5 +1,5 @@ require 'rails_helper' -require 'import/otrs/dynamic_field_examples' +require 'lib/import/otrs/dynamic_field_examples' RSpec.describe Import::OTRS::DynamicField::Checkbox do it_behaves_like 'Import::OTRS::DynamicField' diff --git a/spec/import/otrs/dynamic_field/date_spec.rb b/spec/lib/import/otrs/dynamic_field/date_spec.rb similarity index 95% rename from spec/import/otrs/dynamic_field/date_spec.rb rename to spec/lib/import/otrs/dynamic_field/date_spec.rb index 4cafe944d..2fa688a37 100644 --- a/spec/import/otrs/dynamic_field/date_spec.rb +++ b/spec/lib/import/otrs/dynamic_field/date_spec.rb @@ -1,5 +1,5 @@ require 'rails_helper' -require 'import/otrs/dynamic_field_examples' +require 'lib/import/otrs/dynamic_field_examples' # this require is required (hehe) because of Rails autoloading # which causes this error: diff --git a/spec/import/otrs/dynamic_field/date_time_spec.rb b/spec/lib/import/otrs/dynamic_field/date_time_spec.rb similarity index 95% rename from spec/import/otrs/dynamic_field/date_time_spec.rb rename to spec/lib/import/otrs/dynamic_field/date_time_spec.rb index 2e05c246b..1fc1c7601 100644 --- a/spec/import/otrs/dynamic_field/date_time_spec.rb +++ b/spec/lib/import/otrs/dynamic_field/date_time_spec.rb @@ -1,5 +1,5 @@ require 'rails_helper' -require 'import/otrs/dynamic_field_examples' +require 'lib/import/otrs/dynamic_field_examples' # this require is required (hehe) because of Rails autoloading # which causes this error: diff --git a/spec/import/otrs/dynamic_field/dropdown_spec.rb b/spec/lib/import/otrs/dynamic_field/dropdown_spec.rb similarity index 95% rename from spec/import/otrs/dynamic_field/dropdown_spec.rb rename to spec/lib/import/otrs/dynamic_field/dropdown_spec.rb index da3c1d673..75b7bce81 100644 --- a/spec/import/otrs/dynamic_field/dropdown_spec.rb +++ b/spec/lib/import/otrs/dynamic_field/dropdown_spec.rb @@ -1,5 +1,5 @@ require 'rails_helper' -require 'import/otrs/dynamic_field_examples' +require 'lib/import/otrs/dynamic_field_examples' RSpec.describe Import::OTRS::DynamicField::Dropdown do it_behaves_like 'Import::OTRS::DynamicField' diff --git a/spec/import/otrs/dynamic_field/multiselect_spec.rb b/spec/lib/import/otrs/dynamic_field/multiselect_spec.rb similarity index 95% rename from spec/import/otrs/dynamic_field/multiselect_spec.rb rename to spec/lib/import/otrs/dynamic_field/multiselect_spec.rb index a188bdfca..4b7e0e1c8 100644 --- a/spec/import/otrs/dynamic_field/multiselect_spec.rb +++ b/spec/lib/import/otrs/dynamic_field/multiselect_spec.rb @@ -1,5 +1,5 @@ require 'rails_helper' -require 'import/otrs/dynamic_field_examples' +require 'lib/import/otrs/dynamic_field_examples' RSpec.describe Import::OTRS::DynamicField::Multiselect do it_behaves_like 'Import::OTRS::DynamicField' diff --git a/spec/import/otrs/dynamic_field/text_area_spec.rb b/spec/lib/import/otrs/dynamic_field/text_area_spec.rb similarity index 93% rename from spec/import/otrs/dynamic_field/text_area_spec.rb rename to spec/lib/import/otrs/dynamic_field/text_area_spec.rb index f12d541cd..fa8e430af 100644 --- a/spec/import/otrs/dynamic_field/text_area_spec.rb +++ b/spec/lib/import/otrs/dynamic_field/text_area_spec.rb @@ -1,5 +1,5 @@ require 'rails_helper' -require 'import/otrs/dynamic_field_examples' +require 'lib/import/otrs/dynamic_field_examples' RSpec.describe Import::OTRS::DynamicField::TextArea do it_behaves_like 'Import::OTRS::DynamicField' diff --git a/spec/import/otrs/dynamic_field/text_spec.rb b/spec/lib/import/otrs/dynamic_field/text_spec.rb similarity index 93% rename from spec/import/otrs/dynamic_field/text_spec.rb rename to spec/lib/import/otrs/dynamic_field/text_spec.rb index 80486412e..34201654b 100644 --- a/spec/import/otrs/dynamic_field/text_spec.rb +++ b/spec/lib/import/otrs/dynamic_field/text_spec.rb @@ -1,5 +1,5 @@ require 'rails_helper' -require 'import/otrs/dynamic_field_examples' +require 'lib/import/otrs/dynamic_field_examples' RSpec.describe Import::OTRS::DynamicField::Text do it_behaves_like 'Import::OTRS::DynamicField' diff --git a/spec/import/otrs/dynamic_field_examples.rb b/spec/lib/import/otrs/dynamic_field_examples.rb similarity index 100% rename from spec/import/otrs/dynamic_field_examples.rb rename to spec/lib/import/otrs/dynamic_field_examples.rb diff --git a/spec/import/otrs/dynamic_field_factory_spec.rb b/spec/lib/import/otrs/dynamic_field_factory_spec.rb similarity index 88% rename from spec/import/otrs/dynamic_field_factory_spec.rb rename to spec/lib/import/otrs/dynamic_field_factory_spec.rb index 824b6f3f4..98a1e3b51 100644 --- a/spec/import/otrs/dynamic_field_factory_spec.rb +++ b/spec/lib/import/otrs/dynamic_field_factory_spec.rb @@ -1,6 +1,6 @@ require 'rails_helper' -require 'import/factory_examples' -require 'import/otrs/dynamic_field_examples' +require 'lib/import/factory_examples' +require 'lib/import/otrs/dynamic_field_examples' RSpec.describe Import::OTRS::DynamicFieldFactory do it_behaves_like 'Import::Factory' diff --git a/spec/import/otrs/dynamic_field_spec.rb b/spec/lib/import/otrs/dynamic_field_spec.rb similarity index 90% rename from spec/import/otrs/dynamic_field_spec.rb rename to spec/lib/import/otrs/dynamic_field_spec.rb index 0bf0829ed..e676350d2 100644 --- a/spec/import/otrs/dynamic_field_spec.rb +++ b/spec/lib/import/otrs/dynamic_field_spec.rb @@ -1,5 +1,5 @@ require 'rails_helper' -require 'import/otrs/dynamic_field_examples' +require 'lib/import/otrs/dynamic_field_examples' RSpec.describe Import::OTRS::DynamicField do it_behaves_like 'Import::OTRS::DynamicField' diff --git a/spec/import/otrs/history/article_spec.rb b/spec/lib/import/otrs/history/article_spec.rb similarity index 93% rename from spec/import/otrs/history/article_spec.rb rename to spec/lib/import/otrs/history/article_spec.rb index 0b2b883e7..bf0bc146a 100644 --- a/spec/import/otrs/history/article_spec.rb +++ b/spec/lib/import/otrs/history/article_spec.rb @@ -1,5 +1,5 @@ require 'rails_helper' -require 'import/otrs/history_examples' +require 'lib/import/otrs/history_examples' RSpec.describe Import::OTRS::History::Article do it_behaves_like 'Import::OTRS::History' diff --git a/spec/import/otrs/history/move_spec.rb b/spec/lib/import/otrs/history/move_spec.rb similarity index 93% rename from spec/import/otrs/history/move_spec.rb rename to spec/lib/import/otrs/history/move_spec.rb index d00e931bc..ed32146d8 100644 --- a/spec/import/otrs/history/move_spec.rb +++ b/spec/lib/import/otrs/history/move_spec.rb @@ -1,5 +1,5 @@ require 'rails_helper' -require 'import/otrs/history_examples' +require 'lib/import/otrs/history_examples' RSpec.describe Import::OTRS::History::Move do it_behaves_like 'Import::OTRS::History' diff --git a/spec/import/otrs/history/new_ticket_spec.rb b/spec/lib/import/otrs/history/new_ticket_spec.rb similarity index 91% rename from spec/import/otrs/history/new_ticket_spec.rb rename to spec/lib/import/otrs/history/new_ticket_spec.rb index ef1b33b4a..d76c9c3c5 100644 --- a/spec/import/otrs/history/new_ticket_spec.rb +++ b/spec/lib/import/otrs/history/new_ticket_spec.rb @@ -1,5 +1,5 @@ require 'rails_helper' -require 'import/otrs/history_examples' +require 'lib/import/otrs/history_examples' RSpec.describe Import::OTRS::History::NewTicket do it_behaves_like 'Import::OTRS::History' diff --git a/spec/import/otrs/history/priority_update_spec.rb b/spec/lib/import/otrs/history/priority_update_spec.rb similarity index 93% rename from spec/import/otrs/history/priority_update_spec.rb rename to spec/lib/import/otrs/history/priority_update_spec.rb index f1e407695..251a40d00 100644 --- a/spec/import/otrs/history/priority_update_spec.rb +++ b/spec/lib/import/otrs/history/priority_update_spec.rb @@ -1,5 +1,5 @@ require 'rails_helper' -require 'import/otrs/history_examples' +require 'lib/import/otrs/history_examples' RSpec.describe Import::OTRS::History::PriorityUpdate do it_behaves_like 'Import::OTRS::History' diff --git a/spec/import/otrs/history/state_update_spec.rb b/spec/lib/import/otrs/history/state_update_spec.rb similarity index 93% rename from spec/import/otrs/history/state_update_spec.rb rename to spec/lib/import/otrs/history/state_update_spec.rb index 2a2494122..c307cfbb4 100644 --- a/spec/import/otrs/history/state_update_spec.rb +++ b/spec/lib/import/otrs/history/state_update_spec.rb @@ -1,5 +1,5 @@ require 'rails_helper' -require 'import/otrs/history_examples' +require 'lib/import/otrs/history_examples' RSpec.describe Import::OTRS::History::StateUpdate do it_behaves_like 'Import::OTRS::History' diff --git a/spec/import/otrs/history_examples.rb b/spec/lib/import/otrs/history_examples.rb similarity index 100% rename from spec/import/otrs/history_examples.rb rename to spec/lib/import/otrs/history_examples.rb diff --git a/spec/import/otrs/history_factory_spec.rb b/spec/lib/import/otrs/history_factory_spec.rb similarity index 74% rename from spec/import/otrs/history_factory_spec.rb rename to spec/lib/import/otrs/history_factory_spec.rb index 838394754..cb1504798 100644 --- a/spec/import/otrs/history_factory_spec.rb +++ b/spec/lib/import/otrs/history_factory_spec.rb @@ -1,5 +1,5 @@ require 'rails_helper' -require 'import/factory_examples' +require 'lib/import/factory_examples' RSpec.describe Import::OTRS::HistoryFactory do it_behaves_like 'Import::Factory' diff --git a/spec/import/otrs/history_spec.rb b/spec/lib/import/otrs/history_spec.rb similarity index 88% rename from spec/import/otrs/history_spec.rb rename to spec/lib/import/otrs/history_spec.rb index 6ca040ed6..ee223c8a1 100644 --- a/spec/import/otrs/history_spec.rb +++ b/spec/lib/import/otrs/history_spec.rb @@ -1,5 +1,5 @@ require 'rails_helper' -require 'import/otrs/history_examples' +require 'lib/import/otrs/history_examples' RSpec.describe Import::OTRS::History do diff --git a/spec/import/otrs/priority_factory_spec.rb b/spec/lib/import/otrs/priority_factory_spec.rb similarity index 96% rename from spec/import/otrs/priority_factory_spec.rb rename to spec/lib/import/otrs/priority_factory_spec.rb index 54ada125f..d9637b526 100644 --- a/spec/import/otrs/priority_factory_spec.rb +++ b/spec/lib/import/otrs/priority_factory_spec.rb @@ -1,5 +1,5 @@ require 'rails_helper' -require 'import/factory_examples' +require 'lib/import/factory_examples' RSpec.describe Import::OTRS::PriorityFactory do it_behaves_like 'Import::Factory' diff --git a/spec/import/otrs/priority_spec.rb b/spec/lib/import/otrs/priority_spec.rb similarity index 100% rename from spec/import/otrs/priority_spec.rb rename to spec/lib/import/otrs/priority_spec.rb diff --git a/spec/import/otrs/queue_factory_spec.rb b/spec/lib/import/otrs/queue_factory_spec.rb similarity index 74% rename from spec/import/otrs/queue_factory_spec.rb rename to spec/lib/import/otrs/queue_factory_spec.rb index 9e89bd0f6..5f3d8aa49 100644 --- a/spec/import/otrs/queue_factory_spec.rb +++ b/spec/lib/import/otrs/queue_factory_spec.rb @@ -1,5 +1,5 @@ require 'rails_helper' -require 'import/factory_examples' +require 'lib/import/factory_examples' RSpec.describe Import::OTRS::QueueFactory do it_behaves_like 'Import::Factory' diff --git a/spec/import/otrs/queue_spec.rb b/spec/lib/import/otrs/queue_spec.rb similarity index 100% rename from spec/import/otrs/queue_spec.rb rename to spec/lib/import/otrs/queue_spec.rb diff --git a/spec/import/otrs/requester_spec.rb b/spec/lib/import/otrs/requester_spec.rb similarity index 100% rename from spec/import/otrs/requester_spec.rb rename to spec/lib/import/otrs/requester_spec.rb diff --git a/spec/import/otrs/state_factory_spec.rb b/spec/lib/import/otrs/state_factory_spec.rb similarity index 98% rename from spec/import/otrs/state_factory_spec.rb rename to spec/lib/import/otrs/state_factory_spec.rb index 3601a6547..5f425d5c8 100644 --- a/spec/import/otrs/state_factory_spec.rb +++ b/spec/lib/import/otrs/state_factory_spec.rb @@ -1,5 +1,5 @@ require 'rails_helper' -require 'import/transaction_factory_examples' +require 'lib/import/transaction_factory_examples' RSpec::Matchers.define_negated_matcher :not_change, :change diff --git a/spec/import/otrs/state_spec.rb b/spec/lib/import/otrs/state_spec.rb similarity index 100% rename from spec/import/otrs/state_spec.rb rename to spec/lib/import/otrs/state_spec.rb diff --git a/spec/import/otrs/sys_config_factory_spec.rb b/spec/lib/import/otrs/sys_config_factory_spec.rb similarity index 90% rename from spec/import/otrs/sys_config_factory_spec.rb rename to spec/lib/import/otrs/sys_config_factory_spec.rb index cf646cb3b..7d74e20aa 100644 --- a/spec/import/otrs/sys_config_factory_spec.rb +++ b/spec/lib/import/otrs/sys_config_factory_spec.rb @@ -1,5 +1,5 @@ require 'rails_helper' -require 'import/import_factory_examples' +require 'lib/import/import_factory_examples' RSpec.describe Import::OTRS::SysConfigFactory do it_behaves_like 'Import factory' diff --git a/spec/import/otrs/ticket_factory_spec.rb b/spec/lib/import/otrs/ticket_factory_spec.rb similarity index 74% rename from spec/import/otrs/ticket_factory_spec.rb rename to spec/lib/import/otrs/ticket_factory_spec.rb index fdcb9b201..8cd7718c9 100644 --- a/spec/import/otrs/ticket_factory_spec.rb +++ b/spec/lib/import/otrs/ticket_factory_spec.rb @@ -1,5 +1,5 @@ require 'rails_helper' -require 'import/factory_examples' +require 'lib/import/factory_examples' RSpec.describe Import::OTRS::TicketFactory do it_behaves_like 'Import::Factory' diff --git a/spec/import/otrs/ticket_spec.rb b/spec/lib/import/otrs/ticket_spec.rb similarity index 100% rename from spec/import/otrs/ticket_spec.rb rename to spec/lib/import/otrs/ticket_spec.rb diff --git a/spec/import/otrs/user_factory_spec.rb b/spec/lib/import/otrs/user_factory_spec.rb similarity index 88% rename from spec/import/otrs/user_factory_spec.rb rename to spec/lib/import/otrs/user_factory_spec.rb index 4f38bf84a..812117732 100644 --- a/spec/import/otrs/user_factory_spec.rb +++ b/spec/lib/import/otrs/user_factory_spec.rb @@ -1,5 +1,5 @@ require 'rails_helper' -require 'import/factory_examples' +require 'lib/import/factory_examples' RSpec.describe Import::OTRS::UserFactory do it_behaves_like 'Import::Factory' diff --git a/spec/import/otrs/user_spec.rb b/spec/lib/import/otrs/user_spec.rb similarity index 100% rename from spec/import/otrs/user_spec.rb rename to spec/lib/import/otrs/user_spec.rb diff --git a/spec/import/otrs_spec.rb b/spec/lib/import/otrs_spec.rb similarity index 55% rename from spec/import/otrs_spec.rb rename to spec/lib/import/otrs_spec.rb index efe89745e..aa4437c21 100644 --- a/spec/import/otrs_spec.rb +++ b/spec/lib/import/otrs_spec.rb @@ -1,9 +1,9 @@ require 'rails_helper' -require 'import/helper_examples' -require 'import/importer_examples' -require 'import/otrs/diff_examples' -require 'import/async_examples' -require 'import/import_stats_examples' +require 'lib/import/helper_examples' +require 'lib/import/importer_examples' +require 'lib/import/otrs/diff_examples' +require 'lib/import/async_examples' +require 'lib/import/import_stats_examples' RSpec.describe Import::OTRS do it_behaves_like 'Import backend' diff --git a/spec/import/transaction_factory_examples.rb b/spec/lib/import/transaction_factory_examples.rb similarity index 69% rename from spec/import/transaction_factory_examples.rb rename to spec/lib/import/transaction_factory_examples.rb index 3abe21c6d..53174f041 100644 --- a/spec/import/transaction_factory_examples.rb +++ b/spec/lib/import/transaction_factory_examples.rb @@ -1,4 +1,4 @@ -require 'import/base_factory_examples' +require 'lib/import/base_factory_examples' RSpec.shared_examples 'Import::TransactionFactory' do it_behaves_like 'Import::BaseFactory' diff --git a/spec/import/transaction_factory_spec.rb b/spec/lib/import/transaction_factory_spec.rb similarity index 77% rename from spec/import/transaction_factory_spec.rb rename to spec/lib/import/transaction_factory_spec.rb index d030be279..3425e78d8 100644 --- a/spec/import/transaction_factory_spec.rb +++ b/spec/lib/import/transaction_factory_spec.rb @@ -1,5 +1,5 @@ require 'rails_helper' -require 'import/transaction_factory_examples' +require 'lib/import/transaction_factory_examples' RSpec.describe Import::TransactionFactory do it_behaves_like 'Import::TransactionFactory' diff --git a/spec/import/zendesk/base_factory_examples.rb b/spec/lib/import/zendesk/base_factory_examples.rb similarity index 95% rename from spec/import/zendesk/base_factory_examples.rb rename to spec/lib/import/zendesk/base_factory_examples.rb index adae42f6d..bc38c2063 100644 --- a/spec/import/zendesk/base_factory_examples.rb +++ b/spec/lib/import/zendesk/base_factory_examples.rb @@ -1,4 +1,4 @@ -require 'import/factory_examples' +require 'lib/import/factory_examples' RSpec.shared_examples 'Import::Zendesk::BaseFactory' do it_behaves_like 'Import::Factory' diff --git a/spec/import/zendesk/base_factory_spec.rb b/spec/lib/import/zendesk/base_factory_spec.rb similarity index 70% rename from spec/import/zendesk/base_factory_spec.rb rename to spec/lib/import/zendesk/base_factory_spec.rb index 18a6cc412..d0f00e68a 100644 --- a/spec/import/zendesk/base_factory_spec.rb +++ b/spec/lib/import/zendesk/base_factory_spec.rb @@ -1,5 +1,5 @@ require 'rails_helper' -require 'import/zendesk/base_factory_examples' +require 'lib/import/zendesk/base_factory_examples' RSpec.describe Import::Zendesk::BaseFactory do it_behaves_like 'Import::Zendesk::BaseFactory' diff --git a/spec/import/zendesk/group_factory_spec.rb b/spec/lib/import/zendesk/group_factory_spec.rb similarity index 62% rename from spec/import/zendesk/group_factory_spec.rb rename to spec/lib/import/zendesk/group_factory_spec.rb index 3ab082675..dd34d6174 100644 --- a/spec/import/zendesk/group_factory_spec.rb +++ b/spec/lib/import/zendesk/group_factory_spec.rb @@ -1,6 +1,6 @@ require 'rails_helper' -require 'import/zendesk/base_factory_examples' -require 'import/zendesk/local_id_mapper_hook_examples' +require 'lib/import/zendesk/base_factory_examples' +require 'lib/import/zendesk/local_id_mapper_hook_examples' RSpec.describe Import::Zendesk::GroupFactory do it_behaves_like 'Import::Zendesk::BaseFactory' diff --git a/spec/import/zendesk/group_spec.rb b/spec/lib/import/zendesk/group_spec.rb similarity index 100% rename from spec/import/zendesk/group_spec.rb rename to spec/lib/import/zendesk/group_spec.rb diff --git a/spec/import/zendesk/local_id_mapper_hook_examples.rb b/spec/lib/import/zendesk/local_id_mapper_hook_examples.rb similarity index 100% rename from spec/import/zendesk/local_id_mapper_hook_examples.rb rename to spec/lib/import/zendesk/local_id_mapper_hook_examples.rb diff --git a/spec/import/zendesk/local_id_mapper_hook_spec.rb b/spec/lib/import/zendesk/local_id_mapper_hook_spec.rb similarity index 69% rename from spec/import/zendesk/local_id_mapper_hook_spec.rb rename to spec/lib/import/zendesk/local_id_mapper_hook_spec.rb index 8d527a67c..bf5c2ff46 100644 --- a/spec/import/zendesk/local_id_mapper_hook_spec.rb +++ b/spec/lib/import/zendesk/local_id_mapper_hook_spec.rb @@ -1,5 +1,5 @@ require 'rails_helper' -require 'import/zendesk/local_id_mapper_hook_examples' +require 'lib/import/zendesk/local_id_mapper_hook_examples' RSpec.describe Import::Zendesk::LocalIDMapperHook do it_behaves_like 'Import::Zendesk::LocalIDMapperHook' diff --git a/spec/import/zendesk/lookup_backend_examples.rb b/spec/lib/import/zendesk/lookup_backend_examples.rb similarity index 100% rename from spec/import/zendesk/lookup_backend_examples.rb rename to spec/lib/import/zendesk/lookup_backend_examples.rb diff --git a/spec/import/zendesk/object_attribute/checkbox_spec.rb b/spec/lib/import/zendesk/object_attribute/checkbox_spec.rb similarity index 100% rename from spec/import/zendesk/object_attribute/checkbox_spec.rb rename to spec/lib/import/zendesk/object_attribute/checkbox_spec.rb diff --git a/spec/import/zendesk/object_attribute/date_spec.rb b/spec/lib/import/zendesk/object_attribute/date_spec.rb similarity index 100% rename from spec/import/zendesk/object_attribute/date_spec.rb rename to spec/lib/import/zendesk/object_attribute/date_spec.rb diff --git a/spec/import/zendesk/object_attribute/decimal_spec.rb b/spec/lib/import/zendesk/object_attribute/decimal_spec.rb similarity index 100% rename from spec/import/zendesk/object_attribute/decimal_spec.rb rename to spec/lib/import/zendesk/object_attribute/decimal_spec.rb diff --git a/spec/import/zendesk/object_attribute/dropdown_spec.rb b/spec/lib/import/zendesk/object_attribute/dropdown_spec.rb similarity index 100% rename from spec/import/zendesk/object_attribute/dropdown_spec.rb rename to spec/lib/import/zendesk/object_attribute/dropdown_spec.rb diff --git a/spec/import/zendesk/object_attribute/integer_spec.rb b/spec/lib/import/zendesk/object_attribute/integer_spec.rb similarity index 100% rename from spec/import/zendesk/object_attribute/integer_spec.rb rename to spec/lib/import/zendesk/object_attribute/integer_spec.rb diff --git a/spec/import/zendesk/object_attribute/regexp_spec.rb b/spec/lib/import/zendesk/object_attribute/regexp_spec.rb similarity index 100% rename from spec/import/zendesk/object_attribute/regexp_spec.rb rename to spec/lib/import/zendesk/object_attribute/regexp_spec.rb diff --git a/spec/import/zendesk/object_attribute/tagger_spec.rb b/spec/lib/import/zendesk/object_attribute/tagger_spec.rb similarity index 100% rename from spec/import/zendesk/object_attribute/tagger_spec.rb rename to spec/lib/import/zendesk/object_attribute/tagger_spec.rb diff --git a/spec/import/zendesk/object_attribute/text_spec.rb b/spec/lib/import/zendesk/object_attribute/text_spec.rb similarity index 100% rename from spec/import/zendesk/object_attribute/text_spec.rb rename to spec/lib/import/zendesk/object_attribute/text_spec.rb diff --git a/spec/import/zendesk/object_attribute/textarea_spec.rb b/spec/lib/import/zendesk/object_attribute/textarea_spec.rb similarity index 100% rename from spec/import/zendesk/object_attribute/textarea_spec.rb rename to spec/lib/import/zendesk/object_attribute/textarea_spec.rb diff --git a/spec/import/zendesk/object_attribute_spec.rb b/spec/lib/import/zendesk/object_attribute_spec.rb similarity index 100% rename from spec/import/zendesk/object_attribute_spec.rb rename to spec/lib/import/zendesk/object_attribute_spec.rb diff --git a/spec/import/zendesk/object_field_examples.rb b/spec/lib/import/zendesk/object_field_examples.rb similarity index 100% rename from spec/import/zendesk/object_field_examples.rb rename to spec/lib/import/zendesk/object_field_examples.rb diff --git a/spec/import/zendesk/object_field_spec.rb b/spec/lib/import/zendesk/object_field_spec.rb similarity index 70% rename from spec/import/zendesk/object_field_spec.rb rename to spec/lib/import/zendesk/object_field_spec.rb index 6cafe2c96..035129ddb 100644 --- a/spec/import/zendesk/object_field_spec.rb +++ b/spec/lib/import/zendesk/object_field_spec.rb @@ -1,5 +1,5 @@ require 'rails_helper' -require 'import/zendesk/object_field_examples' +require 'lib/import/zendesk/object_field_examples' RSpec.describe Import::Zendesk::ObjectField do it_behaves_like 'Import::Zendesk::ObjectField' diff --git a/spec/import/zendesk/organization_factory_spec.rb b/spec/lib/import/zendesk/organization_factory_spec.rb similarity index 64% rename from spec/import/zendesk/organization_factory_spec.rb rename to spec/lib/import/zendesk/organization_factory_spec.rb index a3264ee71..380ccb064 100644 --- a/spec/import/zendesk/organization_factory_spec.rb +++ b/spec/lib/import/zendesk/organization_factory_spec.rb @@ -1,6 +1,6 @@ require 'rails_helper' -require 'import/factory_examples' -require 'import/zendesk/local_id_mapper_hook_examples' +require 'lib/import/factory_examples' +require 'lib/import/zendesk/local_id_mapper_hook_examples' RSpec.describe Import::Zendesk::OrganizationFieldFactory do it_behaves_like 'Import::Factory' diff --git a/spec/import/zendesk/organization_field_factory_spec.rb b/spec/lib/import/zendesk/organization_field_factory_spec.rb similarity index 63% rename from spec/import/zendesk/organization_field_factory_spec.rb rename to spec/lib/import/zendesk/organization_field_factory_spec.rb index 78d3eeee3..d48fb5ccb 100644 --- a/spec/import/zendesk/organization_field_factory_spec.rb +++ b/spec/lib/import/zendesk/organization_field_factory_spec.rb @@ -1,6 +1,6 @@ require 'rails_helper' -require 'import/zendesk/base_factory_examples' -require 'import/zendesk/local_id_mapper_hook_examples' +require 'lib/import/zendesk/base_factory_examples' +require 'lib/import/zendesk/local_id_mapper_hook_examples' RSpec.describe Import::Zendesk::OrganizationFieldFactory do it_behaves_like 'Import::Zendesk::BaseFactory' diff --git a/spec/import/zendesk/organization_field_spec.rb b/spec/lib/import/zendesk/organization_field_spec.rb similarity index 71% rename from spec/import/zendesk/organization_field_spec.rb rename to spec/lib/import/zendesk/organization_field_spec.rb index df323d8c4..01b6264ef 100644 --- a/spec/import/zendesk/organization_field_spec.rb +++ b/spec/lib/import/zendesk/organization_field_spec.rb @@ -1,5 +1,5 @@ require 'rails_helper' -require 'import/zendesk/object_field_examples' +require 'lib/import/zendesk/object_field_examples' RSpec.describe Import::Zendesk::OrganizationField do it_behaves_like 'Import::Zendesk::ObjectField' diff --git a/spec/import/zendesk/organization_spec.rb b/spec/lib/import/zendesk/organization_spec.rb similarity index 100% rename from spec/import/zendesk/organization_spec.rb rename to spec/lib/import/zendesk/organization_spec.rb diff --git a/spec/import/zendesk/priority_spec.rb b/spec/lib/import/zendesk/priority_spec.rb similarity index 87% rename from spec/import/zendesk/priority_spec.rb rename to spec/lib/import/zendesk/priority_spec.rb index 5ab940aff..711d8cc96 100644 --- a/spec/import/zendesk/priority_spec.rb +++ b/spec/lib/import/zendesk/priority_spec.rb @@ -1,5 +1,5 @@ require 'rails_helper' -require 'import/zendesk/lookup_backend_examples' +require 'lib/import/zendesk/lookup_backend_examples' RSpec.describe Import::Zendesk::Priority do it_behaves_like 'Lookup backend' diff --git a/spec/import/zendesk/state_spec.rb b/spec/lib/import/zendesk/state_spec.rb similarity index 86% rename from spec/import/zendesk/state_spec.rb rename to spec/lib/import/zendesk/state_spec.rb index 075cb724d..efcb4622a 100644 --- a/spec/import/zendesk/state_spec.rb +++ b/spec/lib/import/zendesk/state_spec.rb @@ -1,5 +1,5 @@ require 'rails_helper' -require 'import/zendesk/lookup_backend_examples' +require 'lib/import/zendesk/lookup_backend_examples' RSpec.describe Import::Zendesk::State do it_behaves_like 'Lookup backend' diff --git a/spec/import/zendesk/ticket/comment/attachment_factory_spec.rb b/spec/lib/import/zendesk/ticket/comment/attachment_factory_spec.rb similarity index 94% rename from spec/import/zendesk/ticket/comment/attachment_factory_spec.rb rename to spec/lib/import/zendesk/ticket/comment/attachment_factory_spec.rb index b069fda43..706d6ba64 100644 --- a/spec/import/zendesk/ticket/comment/attachment_factory_spec.rb +++ b/spec/lib/import/zendesk/ticket/comment/attachment_factory_spec.rb @@ -1,5 +1,5 @@ require 'rails_helper' -require 'import/factory_examples' +require 'lib/import/factory_examples' RSpec.describe Import::Zendesk::Ticket::Comment::AttachmentFactory do it_behaves_like 'Import::Factory' diff --git a/spec/import/zendesk/ticket/comment/attachment_spec.rb b/spec/lib/import/zendesk/ticket/comment/attachment_spec.rb similarity index 100% rename from spec/import/zendesk/ticket/comment/attachment_spec.rb rename to spec/lib/import/zendesk/ticket/comment/attachment_spec.rb diff --git a/spec/import/zendesk/ticket/comment/local_id_lookup_backend_examples.rb b/spec/lib/import/zendesk/ticket/comment/local_id_lookup_backend_examples.rb similarity index 100% rename from spec/import/zendesk/ticket/comment/local_id_lookup_backend_examples.rb rename to spec/lib/import/zendesk/ticket/comment/local_id_lookup_backend_examples.rb diff --git a/spec/import/zendesk/ticket/comment/sender_spec.rb b/spec/lib/import/zendesk/ticket/comment/sender_spec.rb similarity index 62% rename from spec/import/zendesk/ticket/comment/sender_spec.rb rename to spec/lib/import/zendesk/ticket/comment/sender_spec.rb index 283359857..af88a3380 100644 --- a/spec/import/zendesk/ticket/comment/sender_spec.rb +++ b/spec/lib/import/zendesk/ticket/comment/sender_spec.rb @@ -1,5 +1,5 @@ require 'rails_helper' -require 'import/zendesk/ticket/comment/local_id_lookup_backend_examples' +require 'lib/import/zendesk/ticket/comment/local_id_lookup_backend_examples' RSpec.describe Import::Zendesk::Ticket::Comment::Sender do it_behaves_like 'local_id lookup backend' diff --git a/spec/import/zendesk/ticket/comment/type_spec.rb b/spec/lib/import/zendesk/ticket/comment/type_spec.rb similarity index 62% rename from spec/import/zendesk/ticket/comment/type_spec.rb rename to spec/lib/import/zendesk/ticket/comment/type_spec.rb index 2af45a32e..526ceb8a6 100644 --- a/spec/import/zendesk/ticket/comment/type_spec.rb +++ b/spec/lib/import/zendesk/ticket/comment/type_spec.rb @@ -1,5 +1,5 @@ require 'rails_helper' -require 'import/zendesk/ticket/comment/local_id_lookup_backend_examples' +require 'lib/import/zendesk/ticket/comment/local_id_lookup_backend_examples' RSpec.describe Import::Zendesk::Ticket::Comment::Type do it_behaves_like 'local_id lookup backend' diff --git a/spec/import/zendesk/ticket/comment_factory_spec.rb b/spec/lib/import/zendesk/ticket/comment_factory_spec.rb similarity index 69% rename from spec/import/zendesk/ticket/comment_factory_spec.rb rename to spec/lib/import/zendesk/ticket/comment_factory_spec.rb index 3148948be..13ab0aa82 100644 --- a/spec/import/zendesk/ticket/comment_factory_spec.rb +++ b/spec/lib/import/zendesk/ticket/comment_factory_spec.rb @@ -1,5 +1,5 @@ require 'rails_helper' -require 'import/zendesk/ticket/sub_object_factory_examples' +require 'lib/import/zendesk/ticket/sub_object_factory_examples' RSpec.describe Import::Zendesk::Ticket::CommentFactory do it_behaves_like 'Import::Zendesk::Ticket::SubObjectFactory' diff --git a/spec/import/zendesk/ticket/comment_spec.rb b/spec/lib/import/zendesk/ticket/comment_spec.rb similarity index 100% rename from spec/import/zendesk/ticket/comment_spec.rb rename to spec/lib/import/zendesk/ticket/comment_spec.rb diff --git a/spec/import/zendesk/ticket/sub_object_factory_examples.rb b/spec/lib/import/zendesk/ticket/sub_object_factory_examples.rb similarity index 95% rename from spec/import/zendesk/ticket/sub_object_factory_examples.rb rename to spec/lib/import/zendesk/ticket/sub_object_factory_examples.rb index afd8502ac..89564b600 100644 --- a/spec/import/zendesk/ticket/sub_object_factory_examples.rb +++ b/spec/lib/import/zendesk/ticket/sub_object_factory_examples.rb @@ -1,5 +1,5 @@ require 'rails_helper' -require 'import/factory_examples' +require 'lib/import/factory_examples' RSpec.shared_examples 'Import::Zendesk::Ticket::SubObjectFactory' do it_behaves_like 'Import::Factory' diff --git a/spec/import/zendesk/ticket/tag_factory_spec.rb b/spec/lib/import/zendesk/ticket/tag_factory_spec.rb similarity index 69% rename from spec/import/zendesk/ticket/tag_factory_spec.rb rename to spec/lib/import/zendesk/ticket/tag_factory_spec.rb index 02011c259..9b893b229 100644 --- a/spec/import/zendesk/ticket/tag_factory_spec.rb +++ b/spec/lib/import/zendesk/ticket/tag_factory_spec.rb @@ -1,5 +1,5 @@ require 'rails_helper' -require 'import/zendesk/ticket/sub_object_factory_examples' +require 'lib/import/zendesk/ticket/sub_object_factory_examples' RSpec.describe Import::Zendesk::Ticket::TagFactory do it_behaves_like 'Import::Zendesk::Ticket::SubObjectFactory' diff --git a/spec/import/zendesk/ticket/tag_spec.rb b/spec/lib/import/zendesk/ticket/tag_spec.rb similarity index 100% rename from spec/import/zendesk/ticket/tag_spec.rb rename to spec/lib/import/zendesk/ticket/tag_spec.rb diff --git a/spec/import/zendesk/ticket_factory_spec.rb b/spec/lib/import/zendesk/ticket_factory_spec.rb similarity index 71% rename from spec/import/zendesk/ticket_factory_spec.rb rename to spec/lib/import/zendesk/ticket_factory_spec.rb index d92f06c4a..6bfe6e105 100644 --- a/spec/import/zendesk/ticket_factory_spec.rb +++ b/spec/lib/import/zendesk/ticket_factory_spec.rb @@ -1,5 +1,5 @@ require 'rails_helper' -require 'import/zendesk/base_factory_examples' +require 'lib/import/zendesk/base_factory_examples' RSpec.describe Import::Zendesk::TicketFactory do it_behaves_like 'Import::Zendesk::BaseFactory' diff --git a/spec/import/zendesk/ticket_field_factory_spec.rb b/spec/lib/import/zendesk/ticket_field_factory_spec.rb similarity index 62% rename from spec/import/zendesk/ticket_field_factory_spec.rb rename to spec/lib/import/zendesk/ticket_field_factory_spec.rb index 63d26ccf1..f39a2df6e 100644 --- a/spec/import/zendesk/ticket_field_factory_spec.rb +++ b/spec/lib/import/zendesk/ticket_field_factory_spec.rb @@ -1,6 +1,6 @@ require 'rails_helper' -require 'import/zendesk/base_factory_examples' -require 'import/zendesk/local_id_mapper_hook_examples' +require 'lib/import/zendesk/base_factory_examples' +require 'lib/import/zendesk/local_id_mapper_hook_examples' RSpec.describe Import::Zendesk::TicketFieldFactory do it_behaves_like 'Import::Zendesk::BaseFactory' diff --git a/spec/import/zendesk/ticket_field_spec.rb b/spec/lib/import/zendesk/ticket_field_spec.rb similarity index 70% rename from spec/import/zendesk/ticket_field_spec.rb rename to spec/lib/import/zendesk/ticket_field_spec.rb index 508791f71..71c5975fa 100644 --- a/spec/import/zendesk/ticket_field_spec.rb +++ b/spec/lib/import/zendesk/ticket_field_spec.rb @@ -1,5 +1,5 @@ require 'rails_helper' -require 'import/zendesk/object_field_examples' +require 'lib/import/zendesk/object_field_examples' RSpec.describe Import::Zendesk::TicketField do it_behaves_like 'Import::Zendesk::ObjectField' diff --git a/spec/import/zendesk/ticket_spec.rb b/spec/lib/import/zendesk/ticket_spec.rb similarity index 100% rename from spec/import/zendesk/ticket_spec.rb rename to spec/lib/import/zendesk/ticket_spec.rb diff --git a/spec/import/zendesk/user/group_spec.rb b/spec/lib/import/zendesk/user/group_spec.rb similarity index 77% rename from spec/import/zendesk/user/group_spec.rb rename to spec/lib/import/zendesk/user/group_spec.rb index d2100040f..97ae249f8 100644 --- a/spec/import/zendesk/user/group_spec.rb +++ b/spec/lib/import/zendesk/user/group_spec.rb @@ -1,5 +1,5 @@ require 'rails_helper' -require 'import/zendesk/user/lookup_backend_examples' +require 'lib/import/zendesk/user/lookup_backend_examples' # required due to some of rails autoloading issues require 'import/zendesk/user/group' diff --git a/spec/import/zendesk/user/lookup_backend_examples.rb b/spec/lib/import/zendesk/user/lookup_backend_examples.rb similarity index 100% rename from spec/import/zendesk/user/lookup_backend_examples.rb rename to spec/lib/import/zendesk/user/lookup_backend_examples.rb diff --git a/spec/import/zendesk/user/role_spec.rb b/spec/lib/import/zendesk/user/role_spec.rb similarity index 82% rename from spec/import/zendesk/user/role_spec.rb rename to spec/lib/import/zendesk/user/role_spec.rb index 5bf383d4f..9a0dff009 100644 --- a/spec/import/zendesk/user/role_spec.rb +++ b/spec/lib/import/zendesk/user/role_spec.rb @@ -1,5 +1,5 @@ require 'rails_helper' -require 'import/zendesk/user/lookup_backend_examples' +require 'lib/import/zendesk/user/lookup_backend_examples' # required due to some of rails autoloading issues require 'import/zendesk/user/role' diff --git a/spec/import/zendesk/user_factory_spec.rb b/spec/lib/import/zendesk/user_factory_spec.rb similarity index 61% rename from spec/import/zendesk/user_factory_spec.rb rename to spec/lib/import/zendesk/user_factory_spec.rb index e77608c89..294a3f656 100644 --- a/spec/import/zendesk/user_factory_spec.rb +++ b/spec/lib/import/zendesk/user_factory_spec.rb @@ -1,6 +1,6 @@ require 'rails_helper' -require 'import/zendesk/base_factory_examples' -require 'import/zendesk/local_id_mapper_hook_examples' +require 'lib/import/zendesk/base_factory_examples' +require 'lib/import/zendesk/local_id_mapper_hook_examples' RSpec.describe Import::Zendesk::UserFactory do it_behaves_like 'Import::Zendesk::BaseFactory' diff --git a/spec/import/zendesk/user_field_factory_spec.rb b/spec/lib/import/zendesk/user_field_factory_spec.rb similarity index 62% rename from spec/import/zendesk/user_field_factory_spec.rb rename to spec/lib/import/zendesk/user_field_factory_spec.rb index 03dc38cec..601b0ab25 100644 --- a/spec/import/zendesk/user_field_factory_spec.rb +++ b/spec/lib/import/zendesk/user_field_factory_spec.rb @@ -1,6 +1,6 @@ require 'rails_helper' -require 'import/zendesk/base_factory_examples' -require 'import/zendesk/local_id_mapper_hook_examples' +require 'lib/import/zendesk/base_factory_examples' +require 'lib/import/zendesk/local_id_mapper_hook_examples' RSpec.describe Import::Zendesk::UserFieldFactory do it_behaves_like 'Import::Zendesk::BaseFactory' diff --git a/spec/import/zendesk/user_field_spec.rb b/spec/lib/import/zendesk/user_field_spec.rb similarity index 70% rename from spec/import/zendesk/user_field_spec.rb rename to spec/lib/import/zendesk/user_field_spec.rb index 491c3af88..2325622b7 100644 --- a/spec/import/zendesk/user_field_spec.rb +++ b/spec/lib/import/zendesk/user_field_spec.rb @@ -1,5 +1,5 @@ require 'rails_helper' -require 'import/zendesk/object_field_examples' +require 'lib/import/zendesk/object_field_examples' RSpec.describe Import::Zendesk::UserField do it_behaves_like 'Import::Zendesk::ObjectField' diff --git a/spec/import/zendesk/user_spec.rb b/spec/lib/import/zendesk/user_spec.rb similarity index 100% rename from spec/import/zendesk/user_spec.rb rename to spec/lib/import/zendesk/user_spec.rb diff --git a/spec/import/zendesk_spec.rb b/spec/lib/import/zendesk_spec.rb similarity index 57% rename from spec/import/zendesk_spec.rb rename to spec/lib/import/zendesk_spec.rb index 35ef0ea0f..153fe393b 100644 --- a/spec/import/zendesk_spec.rb +++ b/spec/lib/import/zendesk_spec.rb @@ -1,8 +1,8 @@ require 'rails_helper' -require 'import/helper_examples' -require 'import/importer_examples' -require 'import/async_examples' -require 'import/import_stats_examples' +require 'lib/import/helper_examples' +require 'lib/import/importer_examples' +require 'lib/import/async_examples' +require 'lib/import/import_stats_examples' RSpec.describe Import::Zendesk do it_behaves_like 'Import backend' diff --git a/spec/password_hash_spec.rb b/spec/lib/password_hash_spec.rb similarity index 100% rename from spec/password_hash_spec.rb rename to spec/lib/password_hash_spec.rb diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb index 9d8b4dd45..2fb7affaa 100644 --- a/spec/rails_helper.rb +++ b/spec/rails_helper.rb @@ -6,7 +6,6 @@ require File.expand_path('../../config/environment', __FILE__) abort('The Rails environment is running in production mode!') if Rails.env.production? require 'spec_helper' require 'rspec/rails' -require 'support/factory_girl' # Add additional requires below this line. Rails is not loaded until this point! # Requires supporting ruby files with custom matchers and macros, etc, in @@ -22,12 +21,18 @@ require 'support/factory_girl' # directory. Alternatively, in the individual `*_spec.rb` files, manually # require only the support files necessary. # -# Dir[Rails.root.join('spec/support/**/*.rb')].each { |f| require f } +Dir[Rails.root.join('spec/support/**/*.rb')].each { |f| require f } # Checks for pending migration and applies them before tests are run. # If you are not using ActiveRecord, you can remove this line. ActiveRecord::Migration.maintain_test_schema! +# make sure that all migrations of linked packages are executed +Package::Migration.linked + +# allow requests to Zammad webservices +WebMock.disable_net_connect!(allow: /zammad\.com/) + RSpec.configure do |config| # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures config.fixture_path = "#{::Rails.root}/spec/fixtures" @@ -35,6 +40,12 @@ RSpec.configure do |config| # make usage of time travel helpers possible config.include ActiveSupport::Testing::TimeHelpers + # Zammad specific helpers + config.include ZammadHelper + + # skip Zammad helper functions in the stacktrace to lower noise + config.backtrace_exclusion_patterns << %r{/spec/spec_helper/} + # If you're not using ActiveRecord, or you'd prefer not to run each of your # examples within a transaction, remove the following line or assign false # instead of true. diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 5a2c306a8..b6490dc19 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -16,24 +16,9 @@ # users commonly want. # # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration -require 'spec_helper/zammad_helper' require 'webmock/rspec' RSpec.configure do |config| - # Zammad specific helpers - config.include ZammadHelper - - config.before(:suite) do - # make sure that all migrations of linked packages are executed - Package::Migration.linked - - # allow requests to Zammad webservices - WebMock.disable_net_connect!(allow: /zammad\.com/) - end - - # skip Zammad helper functions in the stacktrace to lower noise - config.backtrace_exclusion_patterns << %r{/spec/spec_helper/} - # rspec-expectations config goes here. You can use an alternate # assertion/expectation library such as wrong or the stdlib/minitest # assertions if you prefer. diff --git a/spec/spec_helper/zammad_helper.rb b/spec/spec_helper/zammad_helper.rb deleted file mode 100644 index 30dbf3859..000000000 --- a/spec/spec_helper/zammad_helper.rb +++ /dev/null @@ -1 +0,0 @@ -require 'spec_helper/zammad_helper/json' diff --git a/spec/spec_helper/zammad_helper/json.rb b/spec/support/json_fixture.rb similarity index 100% rename from spec/spec_helper/zammad_helper/json.rb rename to spec/support/json_fixture.rb