pact_broker 2.9.0 → 2.10.0

data/spec/lib/pact_broker/tags/service_spec.rb

@@ -45,7 +45,6 @@ module PactBroker
           }.by(-1)
         end
       end
-
     end
   end
 end

data/spec/lib/pact_broker/ui/controllers/index_spec.rb

@@ -0,0 +1,71 @@
+require 'spec_helper'
+require 'pact_broker/ui/controllers/index'
+
+require 'rack/test'
+
+module PactBroker
+  module UI
+    module Controllers
+      describe Index do
+
+        include Rack::Test::Methods
+
+        let(:app) { Index }
+
+        describe "/" do
+          describe "GET" do
+
+            before do
+              TestDataBuilder.new
+                .create_consumer
+                .create_provider
+                .create_consumer_version
+                .create_pact
+                .create_webhook
+                .create_verification
+            end
+
+            it "does something" do
+              get "/"
+              expect(last_response.body).to include("Pacts")
+              expect(last_response.status).to eq(200)
+            end
+
+            context "with tags=true" do
+              before do
+                allow(PactBroker::Index::Service).to receive(:find_index_items).and_return([])
+              end
+
+              it "passes tags: true to the IndexService" do
+                expect(PactBroker::Index::Service).to receive(:find_index_items).with(tags: true)
+                get "/", { tags: 'true' }
+              end
+            end
+
+            context "with tags[]=prod" do
+              before do
+                allow(PactBroker::Index::Service).to receive(:find_index_items).and_return([])
+              end
+
+              it "passes tags: ['prod'] to the IndexService" do
+                expect(PactBroker::Index::Service).to receive(:find_index_items).with(tags: ["prod"])
+                get "/", { tags: ["prod"] }
+              end
+            end
+
+            context "with tags=prod" do
+              before do
+                allow(PactBroker::Index::Service).to receive(:find_index_items).and_return([])
+              end
+
+              it "passes tags: ['prod'] to the IndexService" do
+                expect(PactBroker::Index::Service).to receive(:find_index_items).with(tags: ["prod"])
+                get "/", { tags: "prod" }
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/spec/lib/pact_broker/ui/view_models/{relationship_spec.rb → index_item_spec.rb}

@@ -1,28 +1,31 @@
 require 'spec_helper'
-require 'pact_broker/ui/view_models/relationship'
+require 'pact_broker/ui/view_models/index_item'
+require 'pact_broker/domain/index_item'
 
 module PactBroker
   module UI
     module ViewDomain
-      describe Relationship do
+      describe IndexItem do
 
         let(:consumer) { instance_double("PactBroker::Domain::Pacticipant", name: 'Consumer Name')}
         let(:provider) { instance_double("PactBroker::Domain::Pacticipant", name: 'Provider Name')}
         let(:latest_pact) { instance_double("PactBroker::Domain::Pact") }
         let(:latest_verification) { instance_double("PactBroker::Domain::Verification") }
-        let(:domain_relationship) { PactBroker::Domain::Relationship.new(consumer, provider, latest_pact, latest_verification)}
+        let(:domain_relationship) { PactBroker::Domain::IndexItem.new(consumer, provider, latest_pact, latest, latest_verification, [], [], tags)}
+        let(:tags) { [] }
+        let(:latest) { true }
 
-        subject { Relationship.new(domain_relationship) }
+        subject { IndexItem.new(domain_relationship) }
 
         its(:consumer_name) { should eq 'Consumer Name'}
         its(:provider_name) { should eq 'Provider Name'}
-        its(:latest_pact_url) { should eq "/pacts/provider/Provider%20Name/consumer/Consumer%20Name/latest" }
+        its(:pact_url) { should eq "/pacts/provider/Provider%20Name/consumer/Consumer%20Name/latest" }
         its(:consumer_group_url) { should eq "/groups/Consumer%20Name" }
         its(:provider_group_url) { should eq "/groups/Provider%20Name" }
 
         describe "verification_status" do
           let(:domain_relationship) do
-            instance_double("PactBroker::Domain::Relationship",
+            instance_double("PactBroker::Domain::IndexItem",
               verification_status: verification_status,
               provider_name: "Foo",
               latest_verification_provider_version_number: "4.5.6")
@@ -31,7 +34,7 @@ module PactBroker
           let(:pact_changed) { false }
           let(:success) { true }
 
-          subject { Relationship.new(domain_relationship) }
+          subject { IndexItem.new(domain_relationship) }
 
           context "when the pact has never been verified" do
             let(:verification_status) { :never }
@@ -64,15 +67,16 @@ module PactBroker
 
         describe "webhooks" do
           let(:domain_relationship) do
-            instance_double("PactBroker::Domain::Relationship",
+            instance_double("PactBroker::Domain::IndexItem",
               webhook_status: webhook_status,
               last_webhook_execution_date: DateTime.now - 1,
-              latest_pact: double("pact", consumer: consumer, provider: provider)
+              latest_pact: double("pact", consumer: consumer, provider: provider),
+              latest?: true
             )
           end
           let(:webhook_status) { :none }
 
-          subject { Relationship.new(domain_relationship) }
+          subject { IndexItem.new(domain_relationship) }
 
           context "when the webhooks_status is :none" do
             its(:webhook_label) { is_expected.to eq "Create" }
@@ -106,26 +110,42 @@ module PactBroker
           end
         end
 
+        describe "tag_names" do
+          context "when the pact is the overall latest and it has no tag names" do
+            its(:tag_names) { is_expected.to eq " (latest) " }
+          end
+
+          context "when the pact is the overall latest and also has tag names" do
+            let(:tags) { ["master", "prod"] }
+            its(:tag_names) { is_expected.to eq " (latest & latest master, prod) " }
+          end
+
+          context "when the pact is not the latest and has tag names" do
+            let(:latest) { false }
+            let(:tags) { ["master", "prod"] }
+            its(:tag_names) { is_expected.to eq " (latest master, prod) " }
+          end
+
+        end
+
         describe "<=>" do
 
-          let(:relationship_model_4) { double("PactBroker::Domain::Relationship", consumer_name: "A", provider_name: "X") }
-          let(:relationship_model_2) { double("PactBroker::Domain::Relationship", consumer_name: "a", provider_name: "y") }
-          let(:relationship_model_3) { double("PactBroker::Domain::Relationship", consumer_name: "A", provider_name: "Z") }
-          let(:relationship_model_1) { double("PactBroker::Domain::Relationship", consumer_name: "C", provider_name: "A") }
+          let(:relationship_model_4) { double("PactBroker::Domain::IndexItem", consumer_name: "A", provider_name: "X") }
+          let(:relationship_model_2) { double("PactBroker::Domain::IndexItem", consumer_name: "a", provider_name: "y") }
+          let(:relationship_model_3) { double("PactBroker::Domain::IndexItem", consumer_name: "A", provider_name: "Z") }
+          let(:relationship_model_1) { double("PactBroker::Domain::IndexItem", consumer_name: "C", provider_name: "A") }
 
           let(:relationship_models) { [relationship_model_1, relationship_model_3, relationship_model_4, relationship_model_2] }
           let(:ordered_view_models) { [relationship_model_4, relationship_model_2, relationship_model_3, relationship_model_1] }
 
-          let(:relationship_view_models) { relationship_models.collect{ |r| Relationship.new(r)} }
+          let(:relationship_view_models) { relationship_models.collect{ |r| IndexItem.new(r)} }
 
           it "sorts by consumer name then provider name" do
             expect(relationship_view_models.sort.collect{ |r| [r.consumer_name, r.provider_name]})
               .to eq([["A", "X"],["a","y"],["A","Z"],["C", "A"]])
           end
-
         end
-
       end
     end
   end
-end
+end

data/spec/lib/pact_broker/ui/view_models/{relationships_spec.rb → index_items_spec.rb}

@@ -1,17 +1,17 @@
 require 'spec_helper'
-require 'pact_broker/ui/view_models/relationships'
+require 'pact_broker/ui/view_models/index_items'
 
 module PactBroker
   module UI
     module ViewDomain
-      describe Relationships do
+      describe IndexItems do
 
-        let(:relationship_model_4) { double("PactBroker::Domain::Relationship", consumer_name: "A", provider_name: "X") }
-        let(:relationship_model_2) { double("PactBroker::Domain::Relationship", consumer_name: "a", provider_name: "y") }
-        let(:relationship_model_3) { double("PactBroker::Domain::Relationship", consumer_name: "A", provider_name: "Z") }
-        let(:relationship_model_1) { double("PactBroker::Domain::Relationship", consumer_name: "C", provider_name: "A") }
+        let(:relationship_model_4) { double("PactBroker::Domain::IndexItem", consumer_name: "A", provider_name: "X") }
+        let(:relationship_model_2) { double("PactBroker::Domain::IndexItem", consumer_name: "a", provider_name: "y") }
+        let(:relationship_model_3) { double("PactBroker::Domain::IndexItem", consumer_name: "A", provider_name: "Z") }
+        let(:relationship_model_1) { double("PactBroker::Domain::IndexItem", consumer_name: "C", provider_name: "A") }
 
-        subject { Relationships.new([relationship_model_1, relationship_model_3, relationship_model_4, relationship_model_2]) }
+        subject { IndexItems.new([relationship_model_1, relationship_model_3, relationship_model_4, relationship_model_2]) }
 
         describe "#each" do
 
@@ -29,21 +29,21 @@ module PactBroker
 
         describe "size_label" do
           context "when there is 1 relationship" do
-            subject { Relationships.new([relationship_model_1]) }
+            subject { IndexItems.new([relationship_model_1]) }
 
             it "returns '1 pact'" do
               expect(subject.size_label).to eq "1 pact"
             end
           end
           context "when there are 0 relationships" do
-            subject { Relationships.new([]) }
+            subject { IndexItems.new([]) }
 
             it "returns '0 pacts'" do
               expect(subject.size_label).to eq "0 pacts"
             end
           end
           context "when there is more than 1 relationship" do
-            subject { Relationships.new([relationship_model_1, relationship_model_1]) }
+            subject { IndexItems.new([relationship_model_1, relationship_model_1]) }
 
             it "returns 'x pacts'" do
               expect(subject.size_label).to eq "2 pacts"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker
 version: !ruby/object:Gem::Version
-  version: 2.9.0
+  version: 2.10.0
 platform: ruby
 authors:
 - Bethany Skurrie
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-09 00:00:00.000000000 Z
+date: 2017-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -681,11 +681,11 @@ files:
 - lib/pact_broker/doc/views/webhooks.markdown
 - lib/pact_broker/domain.rb
 - lib/pact_broker/domain/group.rb
+- lib/pact_broker/domain/index_item.rb
 - lib/pact_broker/domain/label.rb
 - lib/pact_broker/domain/order_versions.rb
 - lib/pact_broker/domain/pact.rb
 - lib/pact_broker/domain/pacticipant.rb
-- lib/pact_broker/domain/relationship.rb
 - lib/pact_broker/domain/tag.rb
 - lib/pact_broker/domain/verification.rb
 - lib/pact_broker/domain/version.rb
@@ -694,6 +694,7 @@ files:
 - lib/pact_broker/domain/webhook_request.rb
 - lib/pact_broker/domain/webhook_request_header.rb
 - lib/pact_broker/groups/service.rb
+- lib/pact_broker/index/service.rb
 - lib/pact_broker/json.rb
 - lib/pact_broker/labels/repository.rb
 - lib/pact_broker/labels/service.rb
@@ -735,18 +736,19 @@ files:
 - lib/pact_broker/ui/controllers/base_controller.rb
 - lib/pact_broker/ui/controllers/clusters.rb
 - lib/pact_broker/ui/controllers/groups.rb
+- lib/pact_broker/ui/controllers/index.rb
 - lib/pact_broker/ui/controllers/matrix.rb
-- lib/pact_broker/ui/controllers/relationships.rb
 - lib/pact_broker/ui/helpers/url_helper.rb
 - lib/pact_broker/ui/view_models/clusters.rb
+- lib/pact_broker/ui/view_models/index_item.rb
+- lib/pact_broker/ui/view_models/index_items.rb
 - lib/pact_broker/ui/view_models/matrix_line.rb
-- lib/pact_broker/ui/view_models/relationship.rb
-- lib/pact_broker/ui/view_models/relationships.rb
 - lib/pact_broker/ui/views/clusters/show.haml
 - lib/pact_broker/ui/views/groups/show.html.erb
+- lib/pact_broker/ui/views/index/show-with-tags.haml
+- lib/pact_broker/ui/views/index/show.haml
 - lib/pact_broker/ui/views/layouts/main.haml
 - lib/pact_broker/ui/views/matrix/show.haml
-- lib/pact_broker/ui/views/relationships/show.haml
 - lib/pact_broker/verifications/latest_verifications_by_consumer_version.rb
 - lib/pact_broker/verifications/repository.rb
 - lib/pact_broker/verifications/service.rb
@@ -807,8 +809,8 @@ files:
 - public/js/bootstrap.min.js
 - public/stylesheets/github-json.css
 - public/stylesheets/github.css
+- public/stylesheets/index.css
 - public/stylesheets/pact.css
-- public/stylesheets/relationships.css
 - script/db-spec.sh
 - script/foo-bar.json
 - script/publish-2.sh
@@ -865,7 +867,8 @@ files:
 - spec/fixtures/verification.json
 - spec/fixtures/webhook_valid.json
 - spec/integration/app_spec.rb
-- spec/integration/endpoints/group.rb
+- spec/integration/endpoints/group_spec.rb
+- spec/integration/ui/index_spec.rb
 - spec/lib/pact_broker/api/contracts/put_pact_params_contract_spec.rb
 - spec/lib/pact_broker/api/contracts/verification_contract_spec.rb
 - spec/lib/pact_broker/api/contracts/webhook_contract_spec.rb
@@ -920,14 +923,15 @@ files:
 - spec/lib/pact_broker/diagnostic/resources/heartbeat_spec.rb
 - spec/lib/pact_broker/doc/controllers/app_spec.rb
 - spec/lib/pact_broker/domain/group_spec.rb
+- spec/lib/pact_broker/domain/index_items_spec.rb
 - spec/lib/pact_broker/domain/order_versions_spec.rb
 - spec/lib/pact_broker/domain/pacticipant_spec.rb
-- spec/lib/pact_broker/domain/relationship_spec.rb
 - spec/lib/pact_broker/domain/verification_spec.rb
 - spec/lib/pact_broker/domain/version_spec.rb
 - spec/lib/pact_broker/domain/webhook_request_spec.rb
 - spec/lib/pact_broker/domain/webhook_spec.rb
 - spec/lib/pact_broker/groups/service_spec.rb
+- spec/lib/pact_broker/index/service_spec.rb
 - spec/lib/pact_broker/labels/repository_spec.rb
 - spec/lib/pact_broker/labels/service_spec.rb
 - spec/lib/pact_broker/matrix/parse_query_spec.rb
@@ -942,6 +946,7 @@ files:
 - spec/lib/pact_broker/pacts/diff_spec.rb
 - spec/lib/pact_broker/pacts/merger_spec.rb
 - spec/lib/pact_broker/pacts/pact_params_spec.rb
+- spec/lib/pact_broker/pacts/pact_publication_spec.rb
 - spec/lib/pact_broker/pacts/pact_version_spec.rb
 - spec/lib/pact_broker/pacts/repository_spec.rb
 - spec/lib/pact_broker/pacts/service_spec.rb
@@ -949,9 +954,9 @@ files:
 - spec/lib/pact_broker/tags/repository_spec.rb
 - spec/lib/pact_broker/tags/service_spec.rb
 - spec/lib/pact_broker/ui/controllers/clusters_spec.rb
-- spec/lib/pact_broker/ui/controllers/relationships_spec.rb
-- spec/lib/pact_broker/ui/view_models/relationship_spec.rb
-- spec/lib/pact_broker/ui/view_models/relationships_spec.rb
+- spec/lib/pact_broker/ui/controllers/index_spec.rb
+- spec/lib/pact_broker/ui/view_models/index_item_spec.rb
+- spec/lib/pact_broker/ui/view_models/index_items_spec.rb
 - spec/lib/pact_broker/verifications/repository_spec.rb
 - spec/lib/pact_broker/verifications/service_spec.rb
 - spec/lib/pact_broker/verifications/summary_for_consumer_version_spec.rb
@@ -1101,7 +1106,8 @@ test_files:
 - spec/fixtures/verification.json
 - spec/fixtures/webhook_valid.json
 - spec/integration/app_spec.rb
-- spec/integration/endpoints/group.rb
+- spec/integration/endpoints/group_spec.rb
+- spec/integration/ui/index_spec.rb
 - spec/lib/pact_broker/api/contracts/put_pact_params_contract_spec.rb
 - spec/lib/pact_broker/api/contracts/verification_contract_spec.rb
 - spec/lib/pact_broker/api/contracts/webhook_contract_spec.rb
@@ -1156,14 +1162,15 @@ test_files:
 - spec/lib/pact_broker/diagnostic/resources/heartbeat_spec.rb
 - spec/lib/pact_broker/doc/controllers/app_spec.rb
 - spec/lib/pact_broker/domain/group_spec.rb
+- spec/lib/pact_broker/domain/index_items_spec.rb
 - spec/lib/pact_broker/domain/order_versions_spec.rb
 - spec/lib/pact_broker/domain/pacticipant_spec.rb
-- spec/lib/pact_broker/domain/relationship_spec.rb
 - spec/lib/pact_broker/domain/verification_spec.rb
 - spec/lib/pact_broker/domain/version_spec.rb
 - spec/lib/pact_broker/domain/webhook_request_spec.rb
 - spec/lib/pact_broker/domain/webhook_spec.rb
 - spec/lib/pact_broker/groups/service_spec.rb
+- spec/lib/pact_broker/index/service_spec.rb
 - spec/lib/pact_broker/labels/repository_spec.rb
 - spec/lib/pact_broker/labels/service_spec.rb
 - spec/lib/pact_broker/matrix/parse_query_spec.rb
@@ -1178,6 +1185,7 @@ test_files:
 - spec/lib/pact_broker/pacts/diff_spec.rb
 - spec/lib/pact_broker/pacts/merger_spec.rb
 - spec/lib/pact_broker/pacts/pact_params_spec.rb
+- spec/lib/pact_broker/pacts/pact_publication_spec.rb
 - spec/lib/pact_broker/pacts/pact_version_spec.rb
 - spec/lib/pact_broker/pacts/repository_spec.rb
 - spec/lib/pact_broker/pacts/service_spec.rb
@@ -1185,9 +1193,9 @@ test_files:
 - spec/lib/pact_broker/tags/repository_spec.rb
 - spec/lib/pact_broker/tags/service_spec.rb
 - spec/lib/pact_broker/ui/controllers/clusters_spec.rb
-- spec/lib/pact_broker/ui/controllers/relationships_spec.rb
-- spec/lib/pact_broker/ui/view_models/relationship_spec.rb
-- spec/lib/pact_broker/ui/view_models/relationships_spec.rb
+- spec/lib/pact_broker/ui/controllers/index_spec.rb
+- spec/lib/pact_broker/ui/view_models/index_item_spec.rb
+- spec/lib/pact_broker/ui/view_models/index_items_spec.rb
 - spec/lib/pact_broker/verifications/repository_spec.rb
 - spec/lib/pact_broker/verifications/service_spec.rb
 - spec/lib/pact_broker/verifications/summary_for_consumer_version_spec.rb

data/lib/pact_broker/ui/controllers/relationships.rb

@@ -1,21 +0,0 @@
-require 'pact_broker/ui/controllers/base_controller'
-require 'pact_broker/ui/view_models/relationships'
-require 'haml'
-
-module PactBroker
-  module UI
-    module Controllers
-      class Relationships < Base
-
-        include PactBroker::Services
-
-        get "/" do
-          view_model = ViewDomain::Relationships.new(pacticipant_service.find_relationships)
-
-          haml :'relationships/show', {locals: {relationships: view_model, title: "Pacts"}, layout: :'layouts/main'}
-        end
-
-      end
-    end
-  end
-end

data/lib/pact_broker/ui/view_models/relationships.rb

@@ -1,30 +0,0 @@
-require 'pact_broker/ui/view_models/relationship'
-
-module PactBroker
-  module UI
-    module ViewDomain
-      class Relationships
-
-        def initialize relationships
-          @relationships = relationships.collect{ |relationship| Relationship.new(relationship) }.sort
-        end
-
-        def each(&block)
-          relationships.each(&block)
-        end
-
-        def size_label
-          case relationships.size
-          when 1 then "1 pact"
-          else
-            "#{relationships.size} pacts"
-          end
-        end
-
-        private
-
-        attr_reader :relationships
-      end
-    end
-  end
-end