pact_broker 2.16.1 → 2.17.0

data/spec/lib/pact_broker/matrix/row_spec.rb

@@ -14,8 +14,8 @@ module PactBroker
           td.create_pact_with_hierarchy("Foo", "1", "Bar")
         end
 
-        context "with only a consumer_name" do
-          subject { Row.refresh(consumer_name: "Foo") }
+        context "with only a consumer_id" do
+          subject { Row.refresh(consumer_id: td.consumer.id) }
 
           it "refreshes the data for the consumer" do
             subject
@@ -23,8 +23,8 @@ module PactBroker
           end
         end
 
-        context "with only a provider_name" do
-          subject { Row.refresh(provider_name: "Bar") }
+        context "with only a provider_id" do
+          subject { Row.refresh(provider_id: td.provider.id) }
 
           it "refreshes the data for the provider" do
             subject
@@ -32,8 +32,8 @@ module PactBroker
           end
         end
 
-        context "with both consumer_name and provider_name" do
-          subject { Row.refresh(provider_name: "Bar", consumer_name: "Foo") }
+        context "with both consumer_id and provider_id" do
+          subject { Row.refresh(provider_id: td.provider.id, consumer_id: td.consumer.id) }
 
           it "refreshes the data for the consumer and provider" do
             subject
@@ -43,17 +43,17 @@ module PactBroker
 
         context "when there was existing data" do
           it "deletes the existing data before inserting the new data" do
-            Row.refresh(provider_name: "Bar", consumer_name: "Foo")
+            Row.refresh(provider_id: td.provider.id, consumer_id: td.consumer.id)
             expect(Row.count).to eq 1
             td.create_consumer_version("2")
               .create_pact
-            Row.refresh(provider_name: "Bar", consumer_name: "Foo")
+            Row.refresh(provider_id: td.provider.id, consumer_id: td.consumer.id)
             expect(Row.count).to eq 2
           end
         end
 
-        context "with a pacticipant_name" do
-          subject { Row.refresh(pacticipant_name: "Bar") }
+        context "with a pacticipant_id" do
+          subject { Row.refresh(pacticipant_id: td.provider.id) }
 
           it "refreshes the data for both consumer and provider roles" do
             subject

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

@@ -116,6 +116,7 @@ module PactBroker
         before do
           TestDataBuilder.new
             .create_consumer("Consumer")
+            .create_label("finance")
             .create_consumer_version("2.3.4")
             .create_provider("Provider")
             .create_pact

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

@@ -3,35 +3,6 @@ require 'pact_broker/verifications/repository'
 module PactBroker
   module Verifications
     describe Repository do
-
-      describe "#verification_count_for_pact" do
-        let!(:pact_1) do
-          TestDataBuilder.new
-            .create_consumer("Consumer")
-            .create_provider("Provider")
-            .create_consumer_version("1.2.3")
-            .create_pact
-            .create_verification(number: 1)
-            .create_verification(number: 2)
-            .and_return(:pact)
-        end
-        let!(:pact_2) do
-          TestDataBuilder.new
-            .create_consumer("Foo")
-            .create_provider("Bar")
-            .create_consumer_version("4.5.6")
-            .create_pact
-            .create_verification(number: 1)
-            .and_return(:pact)
-        end
-
-        subject { Repository.new.verification_count_for_pact(pact_1) }
-
-        it "returns the number of verifications for the given pact" do
-          expect(subject).to eq 2
-        end
-      end
-
       describe "#find" do
         let!(:pact) do
           builder = TestDataBuilder.new

data/spec/lib/pact_broker/verifications/sequence_spec.rb

@@ -0,0 +1,47 @@
+require 'pact_broker/verifications/sequence'
+
+module PactBroker
+  module Verifications
+    describe Sequence do
+      describe "#next_val", migration: true do
+
+        before do
+          PactBroker::Database.migrate
+        end
+
+        context "when there is a row in the verification_sequence_number table" do
+          before do
+            Sequence.select_all.delete
+            Sequence.insert(value: 1)
+          end
+
+          it "increments the value and returns it" do
+            expect(Sequence.next_val).to eq 2
+          end
+        end
+
+        context "when there is no row in the verification_sequence_number table and no existing verifications" do
+          before do
+            Sequence.select_all.delete
+          end
+
+          it "inserts and returns the value 1" do
+            expect(Sequence.next_val).to eq 1
+          end
+        end
+
+        context "when there is no row in the verification_sequence_number table and there are existing verifications" do
+          before do
+            Sequence.select_all.delete
+            TestDataBuilder.new.create_pact_with_hierarchy("A", "1", "B")
+              .create_verification(provider_version: "2")
+          end
+
+          it "inserts a number that is guaranteed to be higher than any of the existing verification numbers from when we tried to do this without a sequence" do
+            expect(Sequence.next_val).to eq 101
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -8,19 +8,6 @@ module PactBroker
 
       subject { PactBroker::Verifications::Service }
 
-      describe "#next_number_for" do
-
-        let(:pact) { double(:pact) }
-
-        before do
-          allow_any_instance_of(PactBroker::Verifications::Repository).to receive(:verification_count_for_pact).and_return(2)
-        end
-
-        it "returns the number for the next build to be recorded for a pact" do
-          expect(subject.next_number_for(pact)).to eq 3
-        end
-      end
-
       describe "#create" do
         let(:params) { {'success' => true, 'providerApplicationVersion' => '4.5.6'} }
         let(:pact) { TestDataBuilder.new.create_pact_with_hierarchy.and_return(:pact) }

data/spec/lib/webmachine/convert_request_to_rack_env_spec.rb

@@ -0,0 +1,68 @@
+require 'webmachine/convert_request_to_rack_env'
+require 'webmachine/request'
+
+module Webmachine
+  describe ConvertRequestToRackEnv do
+
+    let(:rack_env) do
+      {
+        "rack.input" => StringIO.new('foo'),
+        "REQUEST_METHOD" => "POST",
+        "SERVER_NAME" => "example.org",
+        "SERVER_PORT" => "80",
+        "QUERY_STRING" => "",
+        "PATH_INFO" => "/foo",
+        "rack.url_scheme" => "http",
+        "SCRIPT_NAME" => "",
+        "CONTENT_LENGTH" => "0",
+        "HTTP_HOST" => "example.org",
+        "CONTENT_TYPE" => "application/x-www-form-urlencoded",
+        "HTTP_AUTHORIZATION"  =>  "auth",
+        "HTTP_TOKEN" => "foo"
+      }
+    end
+
+    let(:expected_rack_env) do
+      {
+        "REQUEST_METHOD" => "POST",
+        "SERVER_NAME" => "example.org",
+        "SERVER_PORT" => "80",
+        "QUERY_STRING" => "",
+        "PATH_INFO" => "/foo",
+        "rack.url_scheme" => "http",
+        "SCRIPT_NAME" => "",
+        "CONTENT_LENGTH" => "0",
+        "HTTP_HOST" => "example.org",
+        "CONTENT_TYPE" => "application/x-www-form-urlencoded",
+        "HTTP_AUTHORIZATION" => "[Filtered]",
+        "HTTP_TOKEN" => "[Filtered]"
+      }
+    end
+
+    let(:headers) do
+      Webmachine::Headers.from_cgi(rack_env)
+    end
+
+    let(:rack_req) { ::Rack::Request.new(rack_env) }
+    let(:webmachine_request) do
+      Webmachine::Request.new(rack_req.request_method,
+                              rack_req.url,
+                              headers,
+                              Webmachine::Adapters::Rack::RequestBody.new(rack_req),
+                              nil,
+                              nil
+                             )
+    end
+
+    subject { ConvertRequestToRackEnv.call(webmachine_request) }
+
+    describe ".call" do
+      it "returns a rack env hash created from the Webmachine::Request" do
+        actual_env = subject
+        actual_rack_input = actual_env.delete('rack.input')
+        expect(subject).to eq expected_rack_env
+        expect(actual_rack_input.string).to eq 'foo'
+      end
+    end
+  end
+end

data/spec/support/test_data_builder.rb

@@ -55,6 +55,7 @@ class TestDataBuilder
       params[:provider_name] = provider.name if provider
       matrix_service.refresh(params)
       # Row is not used in production code, but the tests depend on it
+      # Technically this code is expecting ids, but it will work with names too
       PactBroker::Matrix::Row.refresh(params)
     end
   end
@@ -197,6 +198,7 @@ class TestDataBuilder
   def create_consumer_version_tag tag_name, params = {}
     params.delete(:comment)
     @tag = PactBroker::Domain::Tag.create(name: tag_name, version: @consumer_version)
+    refresh_matrix
     self
   end
 

data/tasks/development.rake

@@ -0,0 +1,10 @@
+
+task 'pact_broker:dev:setup' do
+  FileUtils.cp_r 'example', 'dev'
+  gemfile_contents = File.read('dev/Gemfile')
+  new_gemfile_contents = gemfile_contents.gsub(/^.*gem.*pact_broker.*$/, "gem 'pact_broker', path: '../'")
+  File.open('dev/Gemfile', "w") { |file| file << new_gemfile_contents }
+  bundle_install = "BUNDLE_GEMFILE=dev/Gemfile bundle install"
+  puts bundle_install
+  puts `#{bundle_install}`
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker
 version: !ruby/object:Gem::Version
-  version: 2.16.1
+  version: 2.17.0
 platform: ruby
 authors:
 - Bethany Skurrie
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-08 00:00:00.000000000 Z
+date: 2018-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -520,6 +520,8 @@ files:
 - ".csslintrc"
 - ".eslintignore"
 - ".eslintrc.yml"
+- ".github/ISSUE_TEMPLATE.md"
+- ".github/PULL_REQUEST_TEMPLATE.md"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -611,6 +613,8 @@ files:
 - db/migrations/20180208_add_cv_tag_name_index_to_mat_head_matrix.rb
 - db/migrations/20180209_recreate_latest_matrix_for_cv_and_pv_union_all.rb
 - db/migrations/20180210_fix_latest_matrix_for_cv_and_pv_again.rb
+- db/migrations/20180311_optimise_head_matrix.rb
+- db/migrations/20180315_create_verification_sequence.rb
 - db/migrations/migration_helper.rb
 - db/pact_broker_database.sqlite3
 - db/test/backwards_compatibility/.rspec
@@ -714,6 +718,7 @@ files:
 - lib/pact_broker/api/resources/badge.rb
 - lib/pact_broker/api/resources/base_resource.rb
 - lib/pact_broker/api/resources/dashboard.rb
+- lib/pact_broker/api/resources/error_handler.rb
 - lib/pact_broker/api/resources/error_test.rb
 - lib/pact_broker/api/resources/group.rb
 - lib/pact_broker/api/resources/index.rb
@@ -861,6 +866,7 @@ files:
 - lib/pact_broker/verifications/all_verifications.rb
 - lib/pact_broker/verifications/latest_verifications_by_consumer_version.rb
 - lib/pact_broker/verifications/repository.rb
+- lib/pact_broker/verifications/sequence.rb
 - lib/pact_broker/verifications/service.rb
 - lib/pact_broker/verifications/summary_for_consumer_version.rb
 - lib/pact_broker/verifications/verification_status.rb
@@ -890,6 +896,7 @@ files:
 - lib/rack/pact_broker/no_auth.rb
 - lib/rack/pact_broker/store_base_url.rb
 - lib/rack/pact_broker/ui_authentication.rb
+- lib/webmachine/convert_request_to_rack_env.rb
 - pact_broker.gemspec
 - pact_broker_client-pact_broker.json
 - public/Network Graph_files/d3.v3.js
@@ -977,6 +984,7 @@ files:
 - spec/features/publish_pact_spec.rb
 - spec/features/publish_verification_spec.rb
 - spec/features/tag_version_spec.rb
+- spec/features/update_matrix_spec.rb
 - spec/features/update_pacticipant_spec.rb
 - spec/fixtures/a_consumer-a_provider-2.json
 - spec/fixtures/a_consumer-a_provider-3.json
@@ -991,6 +999,7 @@ files:
 - spec/fixtures/certificates/self-signed.badssl.com.pem
 - spec/fixtures/consumer-provider.json
 - spec/fixtures/dashboard.json
+- spec/fixtures/foo-bar.json
 - spec/fixtures/renderer_pact.json
 - spec/fixtures/update_pacticipant.json
 - spec/fixtures/updated_pacticipant.json
@@ -1035,6 +1044,7 @@ files:
 - spec/lib/pact_broker/api/resources/badge_spec.rb
 - spec/lib/pact_broker/api/resources/base_resource_spec.rb
 - spec/lib/pact_broker/api/resources/dashboard_spec.rb
+- spec/lib/pact_broker/api/resources/error_handler_spec.rb
 - spec/lib/pact_broker/api/resources/group_spec.rb
 - spec/lib/pact_broker/api/resources/latest_pact_spec.rb
 - spec/lib/pact_broker/api/resources/latest_verifications_for_consumer_version_spec.rb
@@ -1074,6 +1084,7 @@ files:
 - 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/head_row_spec.rb
 - spec/lib/pact_broker/matrix/parse_query_spec.rb
 - spec/lib/pact_broker/matrix/repository_spec.rb
 - spec/lib/pact_broker/matrix/row_spec.rb
@@ -1098,6 +1109,7 @@ files:
 - 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/sequence_spec.rb
 - spec/lib/pact_broker/verifications/service_spec.rb
 - spec/lib/pact_broker/verifications/summary_for_consumer_version_spec.rb
 - spec/lib/pact_broker/verifications/verification_status_spec.rb
@@ -1115,6 +1127,7 @@ files:
 - spec/lib/rack/pact_broker/add_pact_broker_version_header_spec.rb
 - spec/lib/rack/pact_broker/database_transaction_spec.rb
 - spec/lib/rack/pact_broker/invalid_uri_protection_spec.rb
+- spec/lib/webmachine/convert_request_to_rack_env_spec.rb
 - spec/migrations/20180201_create_head_matrix_spec.rb
 - spec/migrations/23_pact_versions_spec.rb
 - spec/migrations/24_populate_pact_contents_spec.rb
@@ -1147,6 +1160,7 @@ files:
 - tasks/database.rb
 - tasks/database/table_dependency_calculator.rb
 - tasks/db.rake
+- tasks/development.rake
 - tasks/pact.rake
 - tasks/release.rake
 - tasks/rspec.rake
@@ -1247,6 +1261,7 @@ test_files:
 - spec/features/publish_pact_spec.rb
 - spec/features/publish_verification_spec.rb
 - spec/features/tag_version_spec.rb
+- spec/features/update_matrix_spec.rb
 - spec/features/update_pacticipant_spec.rb
 - spec/fixtures/a_consumer-a_provider-2.json
 - spec/fixtures/a_consumer-a_provider-3.json
@@ -1261,6 +1276,7 @@ test_files:
 - spec/fixtures/certificates/self-signed.badssl.com.pem
 - spec/fixtures/consumer-provider.json
 - spec/fixtures/dashboard.json
+- spec/fixtures/foo-bar.json
 - spec/fixtures/renderer_pact.json
 - spec/fixtures/update_pacticipant.json
 - spec/fixtures/updated_pacticipant.json
@@ -1305,6 +1321,7 @@ test_files:
 - spec/lib/pact_broker/api/resources/badge_spec.rb
 - spec/lib/pact_broker/api/resources/base_resource_spec.rb
 - spec/lib/pact_broker/api/resources/dashboard_spec.rb
+- spec/lib/pact_broker/api/resources/error_handler_spec.rb
 - spec/lib/pact_broker/api/resources/group_spec.rb
 - spec/lib/pact_broker/api/resources/latest_pact_spec.rb
 - spec/lib/pact_broker/api/resources/latest_verifications_for_consumer_version_spec.rb
@@ -1344,6 +1361,7 @@ test_files:
 - 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/head_row_spec.rb
 - spec/lib/pact_broker/matrix/parse_query_spec.rb
 - spec/lib/pact_broker/matrix/repository_spec.rb
 - spec/lib/pact_broker/matrix/row_spec.rb
@@ -1368,6 +1386,7 @@ test_files:
 - 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/sequence_spec.rb
 - spec/lib/pact_broker/verifications/service_spec.rb
 - spec/lib/pact_broker/verifications/summary_for_consumer_version_spec.rb
 - spec/lib/pact_broker/verifications/verification_status_spec.rb
@@ -1385,6 +1404,7 @@ test_files:
 - spec/lib/rack/pact_broker/add_pact_broker_version_header_spec.rb
 - spec/lib/rack/pact_broker/database_transaction_spec.rb
 - spec/lib/rack/pact_broker/invalid_uri_protection_spec.rb
+- spec/lib/webmachine/convert_request_to_rack_env_spec.rb
 - spec/migrations/20180201_create_head_matrix_spec.rb
 - spec/migrations/23_pact_versions_spec.rb
 - spec/migrations/24_populate_pact_contents_spec.rb