pact_broker 2.0.2 → 2.0.3

data/spec/lib/pact_broker/domain/webhook_spec.rb

@@ -26,6 +26,7 @@ module PactBroker
         end
 
         it "logs before and after" do
+          allow(PactBroker.logger).to receive(:info)
           expect(PactBroker.logger).to receive(:info).with(/Executing/)
           subject.execute
         end

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

@@ -103,14 +103,26 @@ module PactBroker
         let(:pact) { instance_double("PactBroker::Domain::Pact", consumer: consumer, provider: provider)}
         let(:verification) { instance_double("PactBroker::Domain::Verification")}
         let(:pacts) { [pact]}
+        let(:webhooks) { [instance_double("PactBroker::Domain::Webhook")]}
 
         before do
           allow_any_instance_of(PactBroker::Pacts::Repository).to receive(:find_latest_pacts).and_return(pacts)
           allow(PactBroker::Verifications::Service).to receive(:find_latest_verification_for).and_return(verification)
+          allow(PactBroker::Webhooks::Service).to receive(:find_by_consumer_and_provider).and_return(webhooks)
+        end
+
+        it "retrieves the webhooks for the pact" do
+          expect(PactBroker::Webhooks::Service).to receive(:find_by_consumer_and_provider).with(consumer, provider)
+          subject.find_relationships
+        end
+
+        it "retrieves the latest verification for the pact" do
+          expect(PactBroker::Verifications::Service).to receive(:find_latest_verification_for).with(consumer, provider)
+          subject.find_relationships
         end
 
         it "returns a list of relationships" do
-          expect(subject.find_relationships).to eq([PactBroker::Domain::Relationship.create(consumer, provider, pact, verification)])
+          expect(subject.find_relationships).to eq([PactBroker::Domain::Relationship.create(consumer, provider, pact, verification, webhooks)])
         end
 
       end
@@ -127,6 +139,7 @@ module PactBroker
             .create_consumer_version_tag("prod")
             .create_pact
             .create_webhook
+            .create_webhook_execution
             .create_verification
         end
 
@@ -158,6 +171,12 @@ module PactBroker
               }.by(-1)
           end
 
+          it "deletes the webhook executions" do
+            expect{ delete_consumer }.to change{
+              PactBroker::Webhooks::Execution.count
+              }.by(-1)
+          end
+
           it "deletes the child pacts" do
             expect{ delete_consumer }.to change{
               PactBroker::Pacts::PactPublication.count
@@ -196,6 +215,12 @@ module PactBroker
               }.by(-1)
           end
 
+          it "deletes the webhook executions" do
+            expect{ delete_provider }.to change{
+              PactBroker::Webhooks::Execution.count
+              }.by(-1)
+          end
+
           it "deletes the child pacts" do
             expect{ delete_provider }.to change{
               PactBroker::Pacts::PactPublication.count
@@ -207,10 +232,9 @@ module PactBroker
               PactBroker::Domain::Verification.count
               }.by(-1)
           end
-        end
 
+        end
       end
-
     end
   end
-end
+end

data/spec/lib/pact_broker/pacts/pact_version_spec.rb

@@ -48,7 +48,7 @@ module PactBroker
       describe "#latest_consumer_version_number" do
         before do
           builder = ProviderStateBuilder.new
-            builder
+          builder
             .create_consumer
             .create_provider
             .create_consumer_version("1.0.1")

data/spec/lib/pact_broker/pacts/repository_spec.rb

@@ -35,7 +35,7 @@ module PactBroker
           expect(subject.consumer_version_number).to eq '1.2.3'
           expect(subject.consumer_version.number).to eq '1.2.3'
           expect(subject.json_content).to eq json_content
-          expect(subject.created_at).to be_instance_of(DateTime)
+          expect(subject.created_at).to be_datey
         end
 
         context "when a pact already exists with the same content" do
@@ -158,7 +158,7 @@ module PactBroker
           end
 
           it "does not update the created_at timestamp" do
-            expect(subject.created_at).to eq created_at
+            expect(subject.created_at.to_datetime).to eq created_at
           end
         end
       end
@@ -237,8 +237,8 @@ module PactBroker
           expect(subject.first.consumer.name).to eq consumer_name
           expect(subject.first.provider.name).to eq provider_name
           expect(subject.first.consumer_version.number).to eq "2.3.4"
-          expect(subject.first.consumer_version.tags.first.name).to eq "prod"
-          expect(subject.first.consumer_version.tags.last.name).to eq "branch"
+          expect(subject.first.consumer_version.tags.first.name).to eq "branch"
+          expect(subject.first.consumer_version.tags.last.name).to eq "prod"
         end
 
       end
@@ -254,7 +254,7 @@ module PactBroker
               .create_pact
               .create_consumer_version("1.2.3")
               .create_pact
-              .create_consumer("another consumer")
+              .create_consumer("wiffle consumer")
               .create_consumer_version("4.0.0")
               .create_pact
               .create_consumer_version("4.5.6")
@@ -271,7 +271,7 @@ module PactBroker
             expect(subject.first.provider.name).to eq provider_name
             expect(subject.first.consumer_version.number).to eq "1.2.3"
             expect(subject.first.json_content).to be nil
-            expect(subject.last.consumer.name).to eq "another consumer"
+            expect(subject.last.consumer.name).to eq "wiffle consumer"
           end
         end
 
@@ -285,7 +285,7 @@ module PactBroker
               .create_pact
               .create_consumer_version("2.0.0")
               .create_pact
-              .create_consumer("another consumer")
+              .create_consumer("wiffle consumer")
               .create_consumer_version("4.5.6")
               .create_pact
               .create_consumer_version("5.0.0")
@@ -304,7 +304,7 @@ module PactBroker
             expect(subject.first.consumer.name).to eq consumer_name
             expect(subject.first.consumer_version.number).to eq "1.2.3"
             expect(subject.first.json_content).to be nil
-            expect(subject.last.consumer.name).to eq "another consumer"
+            expect(subject.last.consumer.name).to eq "wiffle consumer"
             expect(subject.last.consumer_version.number).to eq "5.0.0"
           end
         end
@@ -498,7 +498,7 @@ module PactBroker
             end
 
             it "has timestamps" do
-              expect(latest_prod_pact.created_at).to be_instance_of(DateTime)
+              expect(latest_prod_pact.created_at).to be_datey
             end
           end
 
@@ -543,7 +543,7 @@ module PactBroker
         it "includes the timestamps - need to update view" do
           pacts = Repository.new.find_latest_pacts
 
-          expect(pacts[0].created_at).to be_instance_of DateTime
+          expect(pacts[0].created_at).to be_datey
         end
       end
     end

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

@@ -37,8 +37,8 @@ module PactBroker
             expect(find_tag.name).to eq tag_name
             expect(find_tag.version.number).to eq version_number
             expect(find_tag.version.pacticipant.name).to eq pacticipant_name
-            expect(find_tag.created_at).to be_instance_of(DateTime)
-            expect(find_tag.updated_at).to be_instance_of(DateTime)
+            expect(find_tag.created_at).to be_datey
+            expect(find_tag.updated_at).to be_datey
           end
 
           context "when case sensitivity is turned off and a name with different case is used" do

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

@@ -15,14 +15,14 @@ module PactBroker
         describe "/" do
           describe "GET" do
 
-            let(:consumer) { instance_double("PactBroker::Domain::Pacticipant", name: 'consumer_name')}
-            let(:provider) { instance_double("PactBroker::Domain::Pacticipant", name: 'provider_name')}
-            let(:pact) { instance_double("PactBroker::Domain::Pact", created_at: Date.new(2017))}
-            let(:relationship) { PactBroker::Domain::Relationship.new(consumer, provider, pact)}
-            let(:relationships) { [relationship] }
-
             before do
-              allow(PactBroker::Pacticipants::Service).to receive(:find_relationships).and_return(relationships)
+              ProviderStateBuilder.new
+                .create_consumer
+                .create_provider
+                .create_consumer_version
+                .create_pact
+                .create_webhook
+                .create_verification
             end
 
             it "does something" do

data/spec/lib/pact_broker/webhooks/repository_spec.rb

@@ -38,7 +38,6 @@ module PactBroker
 
         subject { Repository.new.create uuid, webhook, consumer, provider }
 
-
         it "saves webhook" do
           subject
           expect(created_webhook_record).to include expected_webhook_record
@@ -154,11 +153,11 @@ module PactBroker
           end
 
           it "returns a webhook with a created_at date" do
-            expect(subject.created_at).to be_instance_of(DateTime)
+            expect(subject.created_at).to be_datey
           end
 
           it "returns a webhook with a updated_at date" do
-            expect(subject.updated_at).to be_instance_of(DateTime)
+            expect(subject.updated_at).to be_datey
           end
 
           context "when the body is a XML string" do
@@ -241,6 +240,55 @@ module PactBroker
         end
       end
 
+      describe "create_execution" do
+        let(:webhook_domain) { Repository.new.create uuid, webhook, consumer, provider }
+        let(:webhook_execution_result) { instance_double("PactBroker::Domain::WebhookExecutionResult", success?: true, logs: "logs") }
+
+        subject { Repository.new.create_execution webhook_domain, webhook_execution_result }
+
+        it "saves a new webhook execution " do
+          expect { subject }.to change { Execution.count }.by(1)
+        end
+
+        it "sets the webhook" do
+          expect(subject.webhook.uuid).to eq webhook_domain.uuid
+        end
+
+        it "sets the success" do
+          expect(subject.success).to be true
+        end
+
+        it "sets the logs" do
+          expect(subject.logs).to eq "logs"
+        end
+
+        it "sets the consumer" do
+          expect(subject.consumer).to eq consumer
+        end
+
+        it "sets the provider" do
+          expect(subject.provider).to eq provider
+        end
+
+        it "sets the PactPublication" do
+          expect(subject.pact_publication)
+        end
+      end
+
+      describe "unlink_executions_by_webhook_uuid" do
+        let!(:webhook_domain) { Repository.new.create uuid, webhook, consumer, provider }
+        let!(:webhook_execution_result) { instance_double("PactBroker::Domain::WebhookExecutionResult", success?: true, logs: "logs") }
+        let!(:webhook_execution) { Repository.new.create_execution webhook_domain, webhook_execution_result }
+
+        subject { Repository.new.unlink_executions_by_webhook_uuid uuid }
+
+        it "sets the webhook id to nil" do
+          webhook_id = Webhook.find(uuid: uuid).id
+          expect { subject }.to change {
+              Execution.find(id: webhook_execution.id).webhook_id
+            }.from(webhook_id).to(nil)
+        end
+      end
     end
   end
-end
+end

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

@@ -77,11 +77,16 @@ module PactBroker
             .and_return(:pact)
         end
 
+        subject { PactBroker::Webhooks::Service.execute_webhooks pact }
 
         it "executes the HTTP request of the webhook" do
-          PactBroker::Webhooks::Service.execute_webhooks pact
+          subject
           expect(http_request).to have_been_made
         end
+
+        it "saves the execution" do
+          expect { subject }.to change { PactBroker::Webhooks::Execution.count }.by(1)
+        end
       end
     end
   end

data/spec/migrations/23_pact_versions_spec.rb

@@ -40,7 +40,7 @@ describe 'migrate to pact versions (migrate 22-31)', no_db_clean: :true do
 
   it "uses the old updated date for the new creation date" do
     do_migration
-    expect(database[:latest_pact_publications_by_consumer_versions].order(:id).first[:created_at]).to eq pact_updated_at
+    expect(database[:latest_pact_publications_by_consumer_versions].order(:id).first[:created_at].to_datetime).to eq pact_updated_at
   end
 
   it "sets each revision number to 1" do

data/spec/support/database_cleaner.rb

@@ -4,7 +4,11 @@ RSpec.configure do |config|
   config.before(:suite) do
     if defined?(::DB)
       DatabaseCleaner.strategy = :transaction
-      DatabaseCleaner.clean_with :truncation
+      if DB.mysql?
+        DatabaseCleaner.clean_with :deletion
+      else
+        DatabaseCleaner.clean_with :truncation
+      end
     end
   end
 

data/spec/support/provider_state_builder.rb

@@ -1,6 +1,7 @@
 require 'pact_broker/repositories'
 require 'pact_broker/webhooks/repository'
 require 'pact_broker/webhooks/service'
+require 'pact_broker/domain/webhook_execution_result'
 require 'pact_broker/pacts/repository'
 require 'pact_broker/pacts/service'
 require 'pact_broker/pacticipants/repository'
@@ -18,6 +19,7 @@ require 'pact_broker/verifications/repository'
 require 'pact_broker/verifications/service'
 require 'pact_broker/tags/repository'
 require 'pact_broker/webhooks/repository'
+require 'ostruct'
 
 class ProviderStateBuilder
 
@@ -154,6 +156,12 @@ class ProviderStateBuilder
     self
   end
 
+  def create_webhook_execution
+    webhook_execution_result = PactBroker::Domain::WebhookExecutionResult.new(OpenStruct.new(code: "200"), "logs", nil)
+    @webhook_execution = PactBroker::Webhooks::Repository.new.create_execution @webhook, webhook_execution_result
+    self
+  end
+
   def create_verification parameters = {}
     default_parameters = {success: true, provider_version: '4.5.6', number: 1}
     verification = PactBroker::Domain::Verification.new(default_parameters.merge(parameters))

data/spec/support/rspec_matchers.rb

@@ -0,0 +1,9 @@
+RSpec::Matchers.define :be_datey do |expected|
+  match do |actual|
+    actual.instance_of?(DateTime) || actual.instance_of?(Time)
+  end
+
+  failure_message do |actual|
+    "expected #{actual} to be an instance of DateTime or Time"
+  end
+end

data/tasks/database.rb

@@ -8,7 +8,7 @@ Sequel.extension :migration
 module PactBroker
   module Database
 
-    TABLES = [:config, :pacts, :pact_version_contents, :tags, :verifications, :pact_publications, :pact_versions,  :webhook_headers, :webhooks, :versions, :pacticipants].freeze
+    TABLES = [:webhook_executions, :config, :pacts, :pact_version_contents, :tags, :verifications, :pact_publications, :pact_versions,  :webhook_headers, :webhooks, :versions, :pacticipants].freeze
 
     extend self
 
@@ -123,7 +123,8 @@ module PactBroker
     def configuration_for_env env
       database_yml = PactBroker.project_root.join('config','database.yml')
       config = YAML.load(ERB.new(File.read(database_yml)).result)
-      config.fetch(env)
+      adapter = ENV.fetch('DATABASE_ADAPTER','default')
+      config.fetch(env)[adapter]
     end
 
     def env

data/tasks/db.rake

@@ -20,6 +20,44 @@ namespace :db do
     require File.dirname(__FILE__) + '/database.rb'
   end
 
+  task :create do
+    Rake::Task["db:create:#{ENV.fetch('DATABASE_ADAPTER', 'default')}"].invoke
+  end
+
+  namespace :create do
+    task :default do
+    end
+
+    task :postgres do
+      puts `psql postgres -c "CREATE DATABASE pact_broker;"`
+      puts `psql postgres -c "GRANT ALL PRIVILEGES ON DATABASE pact_broker TO pact_broker;"`
+    end
+
+    task :mysql do
+      puts `mysql -h localhost -u root -e "CREATE DATABASE IF NOT EXISTS pact_broker"`
+      puts `mysql -h localhost -u root -e "GRANT ALL PRIVILEGES ON pact_broker.* TO 'pact_broker'@'localhost' identified by 'pact_broker';"`
+    end
+  end
+
+  task :drop do
+    Rake::Task["db:drop:#{ENV.fetch('DATABASE_ADAPTER', 'default')}"].invoke
+  end
+
+  namespace :drop do
+    desc 'Delete the dev/test database - uses RACK_ENV, defaulting to "development"'
+    task :default => 'db:env' do
+      PactBroker::Database.delete_database_file
+    end
+
+    task :postgres do
+      puts `psql postgres -c "drop DATABASE pact_broker;"`
+    end
+
+    task :mysql do
+      puts `mysql -h localhost -u root -e "DROP DATABASE IF EXISTS pact_broker"`
+    end
+  end
+
   desc 'Print current schema version'
   task :version => 'db:env' do
     puts "Schema Version: #{PactBroker::Database.version}"
@@ -53,9 +91,9 @@ namespace :db do
     PactBroker::Database.ensure_database_dir_exists
   end
 
-  task :create => 'db:env' do
-    PactBroker::Database.create
-  end
+  # task :create => 'db:env' do
+  #   PactBroker::Database.create
+  # end
 
   # Private
   task :set_test_env do