From 9cda387a9b49e86caab29c29c80a7a10e4a7a083 Mon Sep 17 00:00:00 2001 From: Beth Skurrie Date: Thu, 18 Jan 2024 10:48:52 +1100 Subject: [PATCH] refactor: make file and module names consistent in preparation for introducing zeitwerk --- .../pacts_for_verification_json_query_schema.rb | 2 +- lib/pact_broker/api/resources/clean.rb | 2 +- .../api/resources/provider_pacts_for_verification.rb | 4 ++-- lib/pact_broker/app.rb | 1 - lib/pact_broker/config/runtime_configuration.rb | 2 +- ....rb => runtime_configuration_basic_auth_methods.rb} | 0 lib/pact_broker/dashboard/service.rb | 0 lib/pact_broker/pacts/pact_publication.rb | 2 +- .../tags/{head_pact_tags.rb => head_pact_tag.rb} | 0 lib/pact_broker/tasks/clean_task.rb | 2 ++ .../ui/controllers/{base_controller.rb => base.rb} | 0 lib/pact_broker/ui/controllers/can_i_deploy.rb | 4 ++-- lib/pact_broker/ui/controllers/clusters.rb | 2 +- lib/pact_broker/ui/controllers/dashboard.rb | 4 ++-- lib/pact_broker/ui/controllers/error_test.rb | 2 +- lib/pact_broker/ui/controllers/groups.rb | 2 +- lib/pact_broker/ui/controllers/index.rb | 4 ++-- lib/pact_broker/ui/controllers/matrix.rb | 6 +++--- lib/pact_broker/ui/controllers/pacts.rb | 2 +- lib/pact_broker/ui/view_models/clusters.rb | 0 lib/pact_broker/ui/view_models/index_item.rb | 2 +- .../ui/view_models/index_item_branch_head.rb | 2 +- .../ui/view_models/index_item_provider_branch_head.rb | 2 +- lib/pact_broker/ui/view_models/index_items.rb | 2 +- lib/pact_broker/ui/view_models/matrix_branch.rb | 2 +- .../ui/view_models/matrix_deployed_version.rb | 2 +- lib/pact_broker/ui/view_models/matrix_line.rb | 2 +- lib/pact_broker/ui/view_models/matrix_lines.rb | 4 ++-- .../ui/view_models/matrix_released_version.rb | 2 +- lib/pact_broker/ui/view_models/matrix_tag.rb | 2 +- ...verification_json_query_schema_combinations_spec.rb | 10 +++++----- .../pacts_for_verification_json_query_schema_spec.rb | 4 ++-- spec/lib/pact_broker/ui/view_models/index_item_spec.rb | 2 +- .../lib/pact_broker/ui/view_models/index_items_spec.rb | 2 +- .../ui/view_models/matrix_deployed_version_spec.rb | 2 +- .../lib/pact_broker/ui/view_models/matrix_line_spec.rb | 2 +- 36 files changed, 43 insertions(+), 42 deletions(-) rename lib/pact_broker/config/{basic_auth_configuration.rb => runtime_configuration_basic_auth_methods.rb} (100%) delete mode 100644 lib/pact_broker/dashboard/service.rb rename lib/pact_broker/tags/{head_pact_tags.rb => head_pact_tag.rb} (100%) rename lib/pact_broker/ui/controllers/{base_controller.rb => base.rb} (100%) delete mode 100644 lib/pact_broker/ui/view_models/clusters.rb diff --git a/lib/pact_broker/api/contracts/pacts_for_verification_json_query_schema.rb b/lib/pact_broker/api/contracts/pacts_for_verification_json_query_schema.rb index 25f2661d2..bd92341f1 100644 --- a/lib/pact_broker/api/contracts/pacts_for_verification_json_query_schema.rb +++ b/lib/pact_broker/api/contracts/pacts_for_verification_json_query_schema.rb @@ -5,7 +5,7 @@ module PactBroker module Api module Contracts - class PactsForVerificationJSONQuerySchema < BaseContract + class PactsForVerificationJsonQuerySchema < BaseContract json do optional(:providerVersionBranch).maybe(:string) optional(:providerVersionTags).maybe(:array?) diff --git a/lib/pact_broker/api/resources/clean.rb b/lib/pact_broker/api/resources/clean.rb index d9aa9c53e..731cf2147 100644 --- a/lib/pact_broker/api/resources/clean.rb +++ b/lib/pact_broker/api/resources/clean.rb @@ -19,7 +19,7 @@ def allowed_methods def process_post if content_type_json? keep_selectors = (params[:keep] || []).collect do | hash | - PactBroker::Matrix::UnresolvedSelector.new(hash) + PactBroker::DB::Clean::Selector.new(hash) end result = PactBroker::DB::Clean.call(Sequel::Model.db, { keep: keep_selectors }) diff --git a/lib/pact_broker/api/resources/provider_pacts_for_verification.rb b/lib/pact_broker/api/resources/provider_pacts_for_verification.rb index 852e143d4..9a6b91489 100644 --- a/lib/pact_broker/api/resources/provider_pacts_for_verification.rb +++ b/lib/pact_broker/api/resources/provider_pacts_for_verification.rb @@ -68,9 +68,9 @@ def to_json def schema if request.get? - PactBroker::Api::Contracts::PactsForVerificationQueryStringSchema + api_contract_class(:pacts_for_verification_query_string_schema) elsif request.post? - PactBroker::Api::Contracts::PactsForVerificationJSONQuerySchema + api_contract_class(:pacts_for_verification_json_query_schema) end end diff --git a/lib/pact_broker/app.rb b/lib/pact_broker/app.rb index d85c46fb8..32e225f9f 100644 --- a/lib/pact_broker/app.rb +++ b/lib/pact_broker/app.rb @@ -28,7 +28,6 @@ require "sucker_punch" require "pact_broker/api/middleware/configuration" require "pact_broker/api/middleware/basic_auth" -require "pact_broker/config/basic_auth_configuration" require "pact_broker/api/authorization/resource_access_policy" require "pact_broker/api/middleware/http_debug_logs" require "pact_broker/application_context" diff --git a/lib/pact_broker/config/runtime_configuration.rb b/lib/pact_broker/config/runtime_configuration.rb index ba4d6e4b3..538c9003b 100644 --- a/lib/pact_broker/config/runtime_configuration.rb +++ b/lib/pact_broker/config/runtime_configuration.rb @@ -3,7 +3,7 @@ require "pact_broker/config/runtime_configuration_database_methods" require "pact_broker/config/runtime_configuration_coercion_methods" require "pact_broker/version" -require "pact_broker/config/basic_auth_configuration" +require "pact_broker/config/runtime_configuration_basic_auth_methods" require "pact_broker/string_refinements" require "pact_broker/hash_refinements" require "pact_broker/error" diff --git a/lib/pact_broker/config/basic_auth_configuration.rb b/lib/pact_broker/config/runtime_configuration_basic_auth_methods.rb similarity index 100% rename from lib/pact_broker/config/basic_auth_configuration.rb rename to lib/pact_broker/config/runtime_configuration_basic_auth_methods.rb diff --git a/lib/pact_broker/dashboard/service.rb b/lib/pact_broker/dashboard/service.rb deleted file mode 100644 index e69de29bb..000000000 diff --git a/lib/pact_broker/pacts/pact_publication.rb b/lib/pact_broker/pacts/pact_publication.rb index 8aedb4a8b..024c95f27 100644 --- a/lib/pact_broker/pacts/pact_publication.rb +++ b/lib/pact_broker/pacts/pact_publication.rb @@ -3,7 +3,7 @@ require "pact_broker/domain/pact" require "pact_broker/pacts/pact_version" require "pact_broker/integrations/integration" -require "pact_broker/tags/head_pact_tags" +require "pact_broker/tags/head_pact_tag" require "pact_broker/pacts/pact_publication_dataset_module" require "pact_broker/pacts/pact_publication_wip_dataset_module" require "pact_broker/pacts/eager_loaders" diff --git a/lib/pact_broker/tags/head_pact_tags.rb b/lib/pact_broker/tags/head_pact_tag.rb similarity index 100% rename from lib/pact_broker/tags/head_pact_tags.rb rename to lib/pact_broker/tags/head_pact_tag.rb diff --git a/lib/pact_broker/tasks/clean_task.rb b/lib/pact_broker/tasks/clean_task.rb index d356a8c5a..f51d12155 100644 --- a/lib/pact_broker/tasks/clean_task.rb +++ b/lib/pact_broker/tasks/clean_task.rb @@ -1,3 +1,5 @@ +require "rake/tasklib" + module PactBroker module DB class CleanTask < ::Rake::TaskLib diff --git a/lib/pact_broker/ui/controllers/base_controller.rb b/lib/pact_broker/ui/controllers/base.rb similarity index 100% rename from lib/pact_broker/ui/controllers/base_controller.rb rename to lib/pact_broker/ui/controllers/base.rb diff --git a/lib/pact_broker/ui/controllers/can_i_deploy.rb b/lib/pact_broker/ui/controllers/can_i_deploy.rb index 21906c7b8..91e36f709 100644 --- a/lib/pact_broker/ui/controllers/can_i_deploy.rb +++ b/lib/pact_broker/ui/controllers/can_i_deploy.rb @@ -1,4 +1,4 @@ -require "pact_broker/ui/controllers/base_controller" +require "pact_broker/ui/controllers/base" require "pact_broker/ui/view_models/matrix_lines" require "pact_broker/matrix/unresolved_selector" require "pact_broker/matrix/parse_query" @@ -20,7 +20,7 @@ class CanIDeploy < Base selectors = [ PactBroker::Matrix::UnresolvedSelector.new(pacticipant_name: params[:pacticipant_name], latest: true, tag: params[:tag]) ] options = { latestby: "cvp", limit: 100, tag: params[:to] } result = matrix_service.find(selectors, options) - lines = PactBroker::UI::ViewDomain::MatrixLines.new(result, base_url: base_url) + lines = PactBroker::UI::ViewModels::MatrixLines.new(result, base_url: base_url) locals = { lines: lines, selectors: create_selector_objects(selectors), diff --git a/lib/pact_broker/ui/controllers/clusters.rb b/lib/pact_broker/ui/controllers/clusters.rb index f1d3ff8c2..25f7fc123 100644 --- a/lib/pact_broker/ui/controllers/clusters.rb +++ b/lib/pact_broker/ui/controllers/clusters.rb @@ -18,7 +18,7 @@ def initialize pacticipants, relationships end get "/" do - view_model = ViewDomain::IndexItems.new(pacticipant_service.find_index_items, base_url: base_url) + view_model = ViewModel::IndexItems.new(pacticipant_service.find_index_items, base_url: base_url) haml "clusters/show", locals: { relationships: view_model, base_url: base_url }, escape_html: true end diff --git a/lib/pact_broker/ui/controllers/dashboard.rb b/lib/pact_broker/ui/controllers/dashboard.rb index 075590b67..1b9954952 100644 --- a/lib/pact_broker/ui/controllers/dashboard.rb +++ b/lib/pact_broker/ui/controllers/dashboard.rb @@ -1,4 +1,4 @@ -require "pact_broker/ui/controllers/base_controller" +require "pact_broker/ui/controllers/base" require "pact_broker/ui/view_models/index_items" require "haml" @@ -44,7 +44,7 @@ class Dashboard < Base [] end - view_index_items = ViewDomain::IndexItems.new(index_items, base_url: base_url, view: view) + view_index_items = ViewModel::IndexItems.new(index_items, base_url: base_url, view: view) page = :'dashboard/show' locals = { diff --git a/lib/pact_broker/ui/controllers/error_test.rb b/lib/pact_broker/ui/controllers/error_test.rb index 3ef27be42..e29f9c8ea 100644 --- a/lib/pact_broker/ui/controllers/error_test.rb +++ b/lib/pact_broker/ui/controllers/error_test.rb @@ -1,4 +1,4 @@ -require "pact_broker/ui/controllers/base_controller" +require "pact_broker/ui/controllers/base" require "pact_broker/logging" require "pact_broker/error" diff --git a/lib/pact_broker/ui/controllers/groups.rb b/lib/pact_broker/ui/controllers/groups.rb index 13634fcef..285440739 100644 --- a/lib/pact_broker/ui/controllers/groups.rb +++ b/lib/pact_broker/ui/controllers/groups.rb @@ -1,4 +1,4 @@ -require "pact_broker/ui/controllers/base_controller" +require "pact_broker/ui/controllers/base" require "pact_broker/ui/view_models/index_items" require "haml" diff --git a/lib/pact_broker/ui/controllers/index.rb b/lib/pact_broker/ui/controllers/index.rb index e14f7f0de..3a88ac60e 100644 --- a/lib/pact_broker/ui/controllers/index.rb +++ b/lib/pact_broker/ui/controllers/index.rb @@ -1,4 +1,4 @@ -require "pact_broker/ui/controllers/base_controller" +require "pact_broker/ui/controllers/base" require "pact_broker/ui/view_models/index_items" require "pact_broker/string_refinements" require "haml" @@ -33,7 +33,7 @@ class Index < Base error_messages << "No pacticipants found matching: \"#{search}\"" end - view_index_items = ViewDomain::IndexItems.new(index_items, base_url: base_url) + view_index_items = PactBroker::UI::ViewModels::IndexItems.new(index_items, base_url: base_url) page = tags ? :'index/show-with-tags' : :'index/show' locals = { diff --git a/lib/pact_broker/ui/controllers/matrix.rb b/lib/pact_broker/ui/controllers/matrix.rb index 41816ceb1..a3629ffbc 100644 --- a/lib/pact_broker/ui/controllers/matrix.rb +++ b/lib/pact_broker/ui/controllers/matrix.rb @@ -1,4 +1,4 @@ -require "pact_broker/ui/controllers/base_controller" +require "pact_broker/ui/controllers/base" require "pact_broker/ui/view_models/matrix_lines" require "pact_broker/matrix/unresolved_selector" require "pact_broker/matrix/parse_query" @@ -32,7 +32,7 @@ class Matrix < Base errors = matrix_service.validate_selectors(selectors, options) if errors.empty? lines = matrix_service.find(selectors, options) - locals[:lines] = PactBroker::UI::ViewDomain::MatrixLines.new(lines, base_url: base_url) + locals[:lines] = PactBroker::UI::ViewModels::MatrixLines.new(lines, base_url: base_url) locals[:badge_url] = matrix_badge_url(selectors, lines, base_url) else locals[:errors] = errors @@ -52,7 +52,7 @@ class Matrix < Base ] options = { latestby: "cvpv", limit: 100 } lines = matrix_service.find(selectors, options) - lines = PactBroker::UI::ViewDomain::MatrixLines.new(lines, base_url: base_url) + lines = PactBroker::UI::ViewModels::MatrixLines.new(lines, base_url: base_url) locals = { lines: lines, consumer_name: params[:consumer_name], diff --git a/lib/pact_broker/ui/controllers/pacts.rb b/lib/pact_broker/ui/controllers/pacts.rb index 17ba17524..b027a5d09 100644 --- a/lib/pact_broker/ui/controllers/pacts.rb +++ b/lib/pact_broker/ui/controllers/pacts.rb @@ -1,4 +1,4 @@ -require "pact_broker/ui/controllers/base_controller" +require "pact_broker/ui/controllers/base" module PactBroker module UI diff --git a/lib/pact_broker/ui/view_models/clusters.rb b/lib/pact_broker/ui/view_models/clusters.rb deleted file mode 100644 index e69de29bb..000000000 diff --git a/lib/pact_broker/ui/view_models/index_item.rb b/lib/pact_broker/ui/view_models/index_item.rb index 0dabdd5e1..35de8f914 100644 --- a/lib/pact_broker/ui/view_models/index_item.rb +++ b/lib/pact_broker/ui/view_models/index_item.rb @@ -9,7 +9,7 @@ module PactBroker module UI - module ViewDomain + module ViewModels class IndexItem extend Forwardable diff --git a/lib/pact_broker/ui/view_models/index_item_branch_head.rb b/lib/pact_broker/ui/view_models/index_item_branch_head.rb index a6ecb5983..4bb5ffd38 100644 --- a/lib/pact_broker/ui/view_models/index_item_branch_head.rb +++ b/lib/pact_broker/ui/view_models/index_item_branch_head.rb @@ -4,7 +4,7 @@ module PactBroker module UI - module ViewDomain + module ViewModels class IndexItemBranchHead include PactBroker::Api::PactBrokerUrls diff --git a/lib/pact_broker/ui/view_models/index_item_provider_branch_head.rb b/lib/pact_broker/ui/view_models/index_item_provider_branch_head.rb index 043a108c0..ebb079f46 100644 --- a/lib/pact_broker/ui/view_models/index_item_provider_branch_head.rb +++ b/lib/pact_broker/ui/view_models/index_item_provider_branch_head.rb @@ -4,7 +4,7 @@ module PactBroker module UI - module ViewDomain + module ViewModels class IndexItemProviderBranchHead include PactBroker::Api::PactBrokerUrls diff --git a/lib/pact_broker/ui/view_models/index_items.rb b/lib/pact_broker/ui/view_models/index_items.rb index 733cb7610..12a52b917 100644 --- a/lib/pact_broker/ui/view_models/index_items.rb +++ b/lib/pact_broker/ui/view_models/index_items.rb @@ -2,7 +2,7 @@ module PactBroker module UI - module ViewDomain + module ViewModels class IndexItems attr_reader :pagination_record_count diff --git a/lib/pact_broker/ui/view_models/matrix_branch.rb b/lib/pact_broker/ui/view_models/matrix_branch.rb index 7e234f410..b987a41aa 100644 --- a/lib/pact_broker/ui/view_models/matrix_branch.rb +++ b/lib/pact_broker/ui/view_models/matrix_branch.rb @@ -4,7 +4,7 @@ module PactBroker module UI - module ViewDomain + module ViewModels class MatrixBranch include PactBroker::Api::PactBrokerUrls diff --git a/lib/pact_broker/ui/view_models/matrix_deployed_version.rb b/lib/pact_broker/ui/view_models/matrix_deployed_version.rb index d99764f0c..3397d9a50 100644 --- a/lib/pact_broker/ui/view_models/matrix_deployed_version.rb +++ b/lib/pact_broker/ui/view_models/matrix_deployed_version.rb @@ -4,7 +4,7 @@ module PactBroker module UI - module ViewDomain + module ViewModels class MatrixDeployedVersion include PactBroker::Api::PactBrokerUrls diff --git a/lib/pact_broker/ui/view_models/matrix_line.rb b/lib/pact_broker/ui/view_models/matrix_line.rb index 687a9d90e..5f740fbfc 100644 --- a/lib/pact_broker/ui/view_models/matrix_line.rb +++ b/lib/pact_broker/ui/view_models/matrix_line.rb @@ -11,7 +11,7 @@ module PactBroker module UI - module ViewDomain + module ViewModels class MatrixLine include PactBroker::Api::PactBrokerUrls include PactBroker::Messages diff --git a/lib/pact_broker/ui/view_models/matrix_lines.rb b/lib/pact_broker/ui/view_models/matrix_lines.rb index 008704b0b..0c3ada6f2 100644 --- a/lib/pact_broker/ui/view_models/matrix_lines.rb +++ b/lib/pact_broker/ui/view_models/matrix_lines.rb @@ -2,12 +2,12 @@ module PactBroker module UI - module ViewDomain + module ViewModels class MatrixLines < Array def initialize rows, options = {} lines = rows.collect do | row | - PactBroker::UI::ViewDomain::MatrixLine.new(row, options) + PactBroker::UI::ViewModels::MatrixLine.new(row, options) end super(lines.sort) end diff --git a/lib/pact_broker/ui/view_models/matrix_released_version.rb b/lib/pact_broker/ui/view_models/matrix_released_version.rb index c0992dbaa..e924dfbcf 100644 --- a/lib/pact_broker/ui/view_models/matrix_released_version.rb +++ b/lib/pact_broker/ui/view_models/matrix_released_version.rb @@ -4,7 +4,7 @@ module PactBroker module UI - module ViewDomain + module ViewModels class MatrixReleasedVersion include PactBroker::Api::PactBrokerUrls diff --git a/lib/pact_broker/ui/view_models/matrix_tag.rb b/lib/pact_broker/ui/view_models/matrix_tag.rb index 58be4c583..4f118e14d 100644 --- a/lib/pact_broker/ui/view_models/matrix_tag.rb +++ b/lib/pact_broker/ui/view_models/matrix_tag.rb @@ -4,7 +4,7 @@ module PactBroker module UI - module ViewDomain + module ViewModels class MatrixTag include PactBroker::Api::PactBrokerUrls diff --git a/spec/lib/pact_broker/api/contracts/pacts_for_verification_json_query_schema_combinations_spec.rb b/spec/lib/pact_broker/api/contracts/pacts_for_verification_json_query_schema_combinations_spec.rb index 0e8d56e53..724e9ba21 100644 --- a/spec/lib/pact_broker/api/contracts/pacts_for_verification_json_query_schema_combinations_spec.rb +++ b/spec/lib/pact_broker/api/contracts/pacts_for_verification_json_query_schema_combinations_spec.rb @@ -3,7 +3,7 @@ module PactBroker module Api module Contracts - describe PactsForVerificationJSONQuerySchema do + describe PactsForVerificationJsonQuerySchema do include PactBroker::Test::ApiContractSupport ALL_PROPERTIES = { @@ -51,7 +51,7 @@ module Contracts it "is valid" do params = { consumerVersionSelectors: [selector], providerVersionBranch: "main" } - expect(PactsForVerificationJSONQuerySchema.(params).errors).to be_empty + expect(PactsForVerificationJsonQuerySchema.(params).errors).to be_empty end extra_keys = ALL_PROPERTIES.keys - valid_key_combination - [:consumer] @@ -63,11 +63,11 @@ module Contracts describe "with #{selector_with_extra_key}" do if expect_to_be_valid it "is valid" do - expect(PactsForVerificationJSONQuerySchema.(params).errors).to be_empty + expect(PactsForVerificationJsonQuerySchema.(params).errors).to be_empty end else it "is not valid" do - expect(PactsForVerificationJSONQuerySchema.(params).errors).to_not be_empty + expect(PactsForVerificationJsonQuerySchema.(params).errors).to_not be_empty end end end @@ -78,7 +78,7 @@ module Contracts it "is valid" do params = { consumerVersionSelectors: [selector_with_consumer], providerVersionBranch: "main" } - expect(PactsForVerificationJSONQuerySchema.(params).errors.empty?).to be true + expect(PactsForVerificationJsonQuerySchema.(params).errors.empty?).to be true end end end diff --git a/spec/lib/pact_broker/api/contracts/pacts_for_verification_json_query_schema_spec.rb b/spec/lib/pact_broker/api/contracts/pacts_for_verification_json_query_schema_spec.rb index da4205546..bf6aa970f 100644 --- a/spec/lib/pact_broker/api/contracts/pacts_for_verification_json_query_schema_spec.rb +++ b/spec/lib/pact_broker/api/contracts/pacts_for_verification_json_query_schema_spec.rb @@ -3,7 +3,7 @@ module PactBroker module Api module Contracts - describe PactsForVerificationJSONQuerySchema do + describe PactsForVerificationJsonQuerySchema do include PactBroker::Test::ApiContractSupport let(:params) do @@ -22,7 +22,7 @@ module Contracts }] end - subject { format_errors_the_old_way(PactsForVerificationJSONQuerySchema.(params)) } + subject { format_errors_the_old_way(PactsForVerificationJsonQuerySchema.(params)) } context "when nothing is specified" do let(:params) { {} } diff --git a/spec/lib/pact_broker/ui/view_models/index_item_spec.rb b/spec/lib/pact_broker/ui/view_models/index_item_spec.rb index 1cd73fb6d..e15d0b2f9 100644 --- a/spec/lib/pact_broker/ui/view_models/index_item_spec.rb +++ b/spec/lib/pact_broker/ui/view_models/index_item_spec.rb @@ -3,7 +3,7 @@ module PactBroker module UI - module ViewDomain + module ViewModels describe IndexItem do let(:consumer) { instance_double("PactBroker::Domain::Pacticipant", name: "Consumer Name") } diff --git a/spec/lib/pact_broker/ui/view_models/index_items_spec.rb b/spec/lib/pact_broker/ui/view_models/index_items_spec.rb index 533758148..ee8d150dc 100644 --- a/spec/lib/pact_broker/ui/view_models/index_items_spec.rb +++ b/spec/lib/pact_broker/ui/view_models/index_items_spec.rb @@ -3,7 +3,7 @@ module PactBroker module UI - module ViewDomain + module ViewModels describe IndexItems do let(:relationship_model_4) { double("PactBroker::Domain::IndexItem", consumer_name: "A", provider_name: "X", consumer_version_order: 1) } diff --git a/spec/lib/pact_broker/ui/view_models/matrix_deployed_version_spec.rb b/spec/lib/pact_broker/ui/view_models/matrix_deployed_version_spec.rb index fd68ae58c..27f7d1d9e 100644 --- a/spec/lib/pact_broker/ui/view_models/matrix_deployed_version_spec.rb +++ b/spec/lib/pact_broker/ui/view_models/matrix_deployed_version_spec.rb @@ -2,7 +2,7 @@ module PactBroker module UI - module ViewDomain + module ViewModels describe MatrixDeployedVersion do before do allow(subject).to receive(:deployed_version_url).and_return("http://deployed_version") diff --git a/spec/lib/pact_broker/ui/view_models/matrix_line_spec.rb b/spec/lib/pact_broker/ui/view_models/matrix_line_spec.rb index 63d4278ea..db9b0a4de 100644 --- a/spec/lib/pact_broker/ui/view_models/matrix_line_spec.rb +++ b/spec/lib/pact_broker/ui/view_models/matrix_line_spec.rb @@ -3,7 +3,7 @@ module PactBroker module UI - module ViewDomain + module ViewModels describe MatrixLine do let(:line) { instance_spy(PactBroker::Matrix::MatrixRow) }