pact_broker 2.7.0.beta.1 → 2.7.0.beta.2

data/spec/migrations/change_migration_strategy_spec.rb

@@ -0,0 +1,86 @@
+require 'fileutils'
+
+describe "changing from integer to timestamp migrations", no_db_clean: true do
+
+  TEST_DIR = "db/test/change_migration_strategy"
+  DATABASE_PATH = "#{TEST_DIR}/pact_broker_database.sqlite3"
+  DATABASE_CONFIG = {adapter: "sqlite", database: DATABASE_PATH, :encoding => 'utf8'}
+
+  before do
+    @db = Sequel.connect(DATABASE_CONFIG)
+  end
+
+  after do
+    @db.disconnect
+  end
+
+  it "has a clean environment" do
+    FileUtils.rm_rf DATABASE_PATH
+  end
+
+  it "uses pact_broker v 2.6.0" do
+    Dir.chdir(TEST_DIR) do
+      Bundler.with_clean_env do
+        `bundle install --gemfile before/Gemfile`
+        expect(`BUNDLE_GEMFILE=before/Gemfile bundle exec rake pact_broker:version`.strip).to eq '2.6.0'
+      end
+    end
+  end
+
+  it "migrates using integer migrations using pact_broker v2.6.0" do
+    Dir.chdir(TEST_DIR) do
+      Bundler.with_clean_env do
+        output = `BUNDLE_GEMFILE=before/Gemfile bundle exec rake pact_broker:db:migrate[35]`
+        puts output
+        output = `BUNDLE_GEMFILE=before/Gemfile bundle exec rake pact_broker:db:version`
+        puts output
+        expect(output.strip).to eq "35"
+      end
+    end
+  end
+
+  it "allows data to be inserted" do
+    consumer_id = @db[:pacticipants].insert(name: 'Foo', created_at: DateTime.now, updated_at: DateTime.now)
+    provider_id = @db[:pacticipants].insert(name: 'Bar', created_at: DateTime.now, updated_at: DateTime.now)
+    version_id = @db[:versions].insert(number: '1.2.3', pacticipant_id: consumer_id, created_at: DateTime.now, updated_at: DateTime.now)
+    pact_json = {consumer: {name: 'Foo'}, provider: {name: 'Bar'}, interactions: []}.to_json
+    pact_version_id = @db[:pact_versions].insert(sha: '123', content: pact_json, created_at: DateTime.now, consumer_id: consumer_id, provider_id: provider_id)
+    pact_publication_id = @db[:pact_publications].insert(consumer_version_id: version_id, provider_id: provider_id, revision_number: 1, pact_version_id: pact_version_id, created_at: DateTime.now)
+  end
+
+  it "does not have a schema_migrations table" do
+    expect(@db.table_exists?(:schema_migrations)).to be false
+  end
+
+  it "migrates using timestamp migrations using pact_broker > 2.6.0" do
+    Dir.chdir(TEST_DIR) do
+      output = `bundle exec rake pact_broker:db:migrate`
+      puts output
+      output = `bundle exec rake pact_broker:db:version`
+      puts output
+      expect(output.strip).to eq "47"
+    end
+  end
+
+  it "uses the schema_migrations table after v2.6.0" do
+    expect(@db.table_exists?(:schema_migrations)).to be true
+    migrations_count = Dir.glob("db/migrations/**.*").select{ |f| f =~ /\/\d+/ }.count
+    expect(migrations_count).to be >= 47
+    expect(@db[:schema_migrations].count).to eq migrations_count
+    expect(@db[:schema_migrations].order(:filename).first[:filename]).to eq '000001_create_pacticipant_table.rb'
+  end
+
+  it "doesn't need the schema_info table after this" do
+    @db.drop_table(:schema_info)
+  end
+
+  it "allows rollback" do
+    Dir.chdir(TEST_DIR) do
+      output = `bundle exec rake pact_broker:db:migrate[45]`
+      puts output
+      output = `bundle exec rake pact_broker:db:version`
+      puts output
+      expect(output.strip).to eq "45"
+    end
+  end
+end

data/spec/service_consumers/provider_states_for_pact_broker_client.rb

@@ -2,6 +2,18 @@ require 'spec/support/test_data_builder'
 
 Pact.provider_states_for "Pact Broker Client" do
 
+  provider_state "the pact for Foo Thing version 1.2.3 has been verified by Bar version 4.5.6" do
+    set_up do
+      TestDataBuilder.new
+        .create_pact_with_hierarchy("Foo Thing", "1.2.3", "Bar")
+        .create_verification(provider_version: "4.5.6")
+        .create_verification(provider_version: "7.8.9", number: 2)
+        .create_consumer_version("2.0.0")
+        .create_pact
+        .create_verification(provider_version: "4.5.6")
+    end
+  end
+
   provider_state "the pact for Foo version 1.2.3 has been verified by Bar version 4.5.6" do
     set_up do
       TestDataBuilder.new
@@ -14,6 +26,28 @@ Pact.provider_states_for "Pact Broker Client" do
     end
   end
 
+  provider_state "the pact for Foo version 1.2.3 and 1.2.4 has been verified by Bar version 4.5.6" do
+    set_up do
+      TestDataBuilder.new
+        .create_pact_with_hierarchy("Foo", "1.2.3", "Bar")
+        .create_verification(provider_version: "4.5.6")
+        .create_consumer_version("1.2.4")
+        .create_pact
+        .create_verification(provider_version: "4.5.6")
+    end
+  end
+
+  provider_state "the pact for Foo version 1.2.3 has been successfully verified by Bar version 4.5.6, and 1.2.4 unsuccessfully by 9.9.9" do
+    set_up do
+      TestDataBuilder.new
+        .create_pact_with_hierarchy("Foo", "1.2.3", "Bar")
+        .create_verification(provider_version: "4.5.6")
+        .create_consumer_version("1.2.4")
+        .create_pact
+        .create_verification(provider_version: "9.9.9", success: false)
+    end
+  end
+
   provider_state "the 'Pricing Service' does not exist in the pact-broker" do
     no_op
   end

data/spec/support/test_data_builder.rb

@@ -143,6 +143,12 @@ class TestDataBuilder
     self
   end
 
+  def create_provider_version version_number = "1.0.#{model_counter}"
+    @version = PactBroker::Domain::Version.create(:number => version_number, :pacticipant => @provider)
+    @provider_version = @version
+    self
+  end
+
   def use_consumer_version version_number
     @consumer_version = PactBroker::Domain::Version.where(pacticipant_id: @consumer.id, number: version_number).single_record
     self

data/tasks/database.rb

@@ -38,7 +38,7 @@ module PactBroker
     end
 
     def drop_tables
-      (TABLES + [:schema_info]).each do | table_name |
+      (TABLES + [:schema_info, :schema_migrations]).each do | table_name |
         if database.table_exists?(table_name)
           database.drop_table(table_name, cascade: psql?)
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker
 version: !ruby/object:Gem::Version
-  version: 2.7.0.beta.1
+  version: 2.7.0.beta.2
 platform: ruby
 authors:
 - Bethany Skurrie
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-15 00:00:00.000000000 Z
+date: 2017-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -248,6 +248,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.10.3
+- !ruby/object:Gem::Dependency
+  name: table_print
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: bundler-audit
   requirement: !ruby/object:Gem::Requirement
@@ -449,53 +463,53 @@ files:
 - config/boot.rb
 - config/database.travis.yml
 - config/database.yml
-- db/migrations/01_create_pacticipant_table.rb
-- db/migrations/02_create_versions_table.rb
-- db/migrations/03_create_pacts_table.rb
-- db/migrations/04_create_tags_table.rb
-- db/migrations/05_add_order_column_to_version.rb
-- db/migrations/06_make_version_foreign_key_mandatory.rb
-- db/migrations/07_increase_json_content_length.rb
-- db/migrations/08_create_latest_pact_view.rb
-- db/migrations/09_add_timestamps.rb
-- db/migrations/10_populate_timestamps.rb
-- db/migrations/11_made_timestamps_mandatory.rb
-- db/migrations/12_create_webhooks_table.rb
-- db/migrations/13_add_columns_to_webhooks.rb
-- db/migrations/14_add_timestamps_to_pact_views.rb
-- db/migrations/15_create_pact_version_content.rb
-- db/migrations/16_add_pact_content_foreign_key_to_pacts.rb
-- db/migrations/17_migrate_json_content_to_pact_version_content_table.rb
-- db/migrations/18_drop_json_content_column_from_pacts.rb
-- db/migrations/19_make_pact_version_content_sha_not_nullable.rb
-- db/migrations/20_add_pact_version_content_sha_to_all_pacts_view.rb
-- db/migrations/21_recreate_latest_pacts_view.rb
-- db/migrations/22_create_latest_tagged_pacts_view.rb
-- db/migrations/23_create_pact_versions_table.rb
-- db/migrations/24_populate_pact_versions.rb
-- db/migrations/25_make_pv_pacticipants_mandatory.rb
-- db/migrations/26_create_pact_publications.rb
-- db/migrations/27_populate_pact_publications.rb
-- db/migrations/28_create_all_pact_publications.rb
-- db/migrations/29_create_latest_tagged_pact_publications.rb
-- db/migrations/30_drop_old_tables_and_views.rb
-- db/migrations/31_create_verifications.rb
-- db/migrations/32_create_latest_verifications.rb
-- db/migrations/33_create_config_table.rb
-- db/migrations/34_create_index_on_consumer_version_order.rb
-- db/migrations/35_create_index_on_names.rb
-- db/migrations/36_create_webhook_execution.rb
-- db/migrations/37_create_labels_table.rb
-- db/migrations/38_create_triggered_webhooks_table.rb
-- db/migrations/39_add_triggered_webhooks_fk_to_execution.rb
-- db/migrations/40_create_latest_triggered_webhooks_view.rb
-- db/migrations/41_migrate_execution_data.rb
-- db/migrations/42_delete_orphan_webhook_data.rb
-- db/migrations/43_add_provider_version_to_verification.rb
-- db/migrations/44_populate_verifications_provider_version_id.rb
-- db/migrations/45_set_verification_provider_number_nullable.rb
-- db/migrations/46_recreate_latest_verifications.rb
-- db/migrations/47_create_all_verifications.rb
+- db/migrations/000001_create_pacticipant_table.rb
+- db/migrations/000002_create_versions_table.rb
+- db/migrations/000003_create_pacts_table.rb
+- db/migrations/000004_create_tags_table.rb
+- db/migrations/000005_add_order_column_to_version.rb
+- db/migrations/000006_make_version_foreign_key_mandatory.rb
+- db/migrations/000007_increase_json_content_length.rb
+- db/migrations/000008_create_latest_pact_view.rb
+- db/migrations/000009_add_timestamps.rb
+- db/migrations/000010_populate_timestamps.rb
+- db/migrations/000011_made_timestamps_mandatory.rb
+- db/migrations/000012_create_webhooks_table.rb
+- db/migrations/000013_add_columns_to_webhooks.rb
+- db/migrations/000014_add_timestamps_to_pact_views.rb
+- db/migrations/000015_create_pact_version_content.rb
+- db/migrations/000016_add_pact_content_foreign_key_to_pacts.rb
+- db/migrations/000017_migrate_json_content_to_pact_version_content_table.rb
+- db/migrations/000018_drop_json_content_column_from_pacts.rb
+- db/migrations/000019_make_pact_version_content_sha_not_nullable.rb
+- db/migrations/000020_add_pact_version_content_sha_to_all_pacts_view.rb
+- db/migrations/000021_recreate_latest_pacts_view.rb
+- db/migrations/000022_create_latest_tagged_pacts_view.rb
+- db/migrations/000023_create_pact_versions_table.rb
+- db/migrations/000024_populate_pact_versions.rb
+- db/migrations/000025_make_pv_pacticipants_mandatory.rb
+- db/migrations/000026_create_pact_publications.rb
+- db/migrations/000027_populate_pact_publications.rb
+- db/migrations/000028_create_all_pact_publications.rb
+- db/migrations/000029_create_latest_tagged_pact_publications.rb
+- db/migrations/000030_drop_old_tables_and_views.rb
+- db/migrations/000031_create_verifications.rb
+- db/migrations/000032_create_latest_verifications.rb
+- db/migrations/000033_create_config_table.rb
+- db/migrations/000034_create_index_on_consumer_version_order.rb
+- db/migrations/000035_create_index_on_names.rb
+- db/migrations/000036_create_webhook_execution.rb
+- db/migrations/000037_create_labels_table.rb
+- db/migrations/000038_create_triggered_webhooks_table.rb
+- db/migrations/000039_add_triggered_webhooks_fk_to_execution.rb
+- db/migrations/000040_create_latest_triggered_webhooks_view.rb
+- db/migrations/000041_migrate_execution_data.rb
+- db/migrations/000042_delete_orphan_webhook_data.rb
+- db/migrations/000043_add_provider_version_to_verification.rb
+- db/migrations/000044_populate_verifications_provider_version_id.rb
+- db/migrations/000045_set_verification_provider_number_nullable.rb
+- db/migrations/000046_recreate_latest_verifications.rb
+- db/migrations/000047_create_all_verifications.rb
 - db/migrations/migration_helper.rb
 - db/pact_broker_database.sqlite3
 - db/test/backwards_compatibility/.rspec
@@ -515,6 +529,10 @@ files:
 - db/test/backwards_compatibility/gemfiles/2.3.0.gemfile.lock
 - db/test/backwards_compatibility/gemfiles/2.4.2.gemfile
 - db/test/backwards_compatibility/gemfiles/2.4.2.gemfile.lock
+- db/test/backwards_compatibility/gemfiles/2.5.1.gemfile
+- db/test/backwards_compatibility/gemfiles/2.5.1.gemfile.lock
+- db/test/backwards_compatibility/gemfiles/2.6.0.gemfile
+- db/test/backwards_compatibility/gemfiles/2.6.0.gemfile.lock
 - db/test/backwards_compatibility/gemfiles/head.gemfile
 - db/test/backwards_compatibility/gemfiles/head.gemfile.lock
 - db/test/backwards_compatibility/spec/fixtures/foo-bar.json
@@ -522,6 +540,8 @@ files:
 - db/test/backwards_compatibility/spec/spec_helper.rb
 - db/test/backwards_compatibility/spec/support/fixture_helpers.rb
 - db/test/backwards_compatibility/spec/support/request_helpers.rb
+- db/test/change_migration_strategy/Rakefile
+- db/test/change_migration_strategy/before/Gemfile
 - example/Gemfile
 - example/basic_auth/Gemfile
 - example/basic_auth/Procfile
@@ -548,6 +568,7 @@ files:
 - lib/pact_broker/api/decorators/label_decorator.rb
 - lib/pact_broker/api/decorators/latest_pact_decorator.rb
 - lib/pact_broker/api/decorators/matrix_decorator.rb
+- lib/pact_broker/api/decorators/matrix_text_decorator.rb
 - lib/pact_broker/api/decorators/pact_collection_decorator.rb
 - lib/pact_broker/api/decorators/pact_decorator.rb
 - lib/pact_broker/api/decorators/pact_details_decorator.rb
@@ -661,6 +682,7 @@ files:
 - lib/pact_broker/labels/service.rb
 - lib/pact_broker/locale/en.yml
 - lib/pact_broker/logging.rb
+- lib/pact_broker/matrix/parse_query.rb
 - lib/pact_broker/matrix/repository.rb
 - lib/pact_broker/matrix/service.rb
 - lib/pact_broker/messages.rb
@@ -705,7 +727,6 @@ files:
 - lib/pact_broker/ui/views/groups/show.html.erb
 - lib/pact_broker/ui/views/layouts/main.haml
 - lib/pact_broker/ui/views/matrix/show.haml
-- lib/pact_broker/ui/views/relationships/show-prod-tags.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
@@ -729,9 +750,11 @@ files:
 - lib/rack/hal_browser/redirect.rb
 - lib/rack/pact_broker/accepts_html_filter.rb
 - lib/rack/pact_broker/add_pact_broker_version_header.rb
+- lib/rack/pact_broker/configurable_make_it_later.rb
 - lib/rack/pact_broker/convert_file_extension_to_accept_header.rb
 - lib/rack/pact_broker/database_transaction.rb
 - lib/rack/pact_broker/invalid_uri_protection.rb
+- lib/rack/pact_broker/no_auth.rb
 - lib/rack/pact_broker/ui_authentication.rb
 - pact_broker.gemspec
 - pact_broker_client-pact_broker.json
@@ -773,6 +796,7 @@ files:
 - script/publish-not-a-pact.sh
 - script/publish.sh
 - script/recreate-pg-db.sh
+- script/seed-matrix.rb
 - script/seed.rb
 - script/update-hal-browser
 - script/webhook-server.ru
@@ -885,6 +909,7 @@ files:
 - spec/lib/pact_broker/groups/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
 - spec/lib/pact_broker/matrix/repository_spec.rb
 - spec/lib/pact_broker/matrix/service_spec.rb
 - spec/lib/pact_broker/messages_spec.rb
@@ -895,7 +920,6 @@ 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
@@ -930,6 +954,7 @@ files:
 - spec/migrations/41_migrate_execution_data_spec.rb
 - spec/migrations/42_delete_ophan_webhook_data_spec.rb
 - spec/migrations/44_add_provider_version_to_verification_spec.rb
+- spec/migrations/change_migration_strategy_spec.rb
 - spec/service_consumers/pact_helper.rb
 - spec/service_consumers/provider_states_for_pact_broker_client.rb
 - spec/spec_helper.rb
@@ -1118,6 +1143,7 @@ test_files:
 - spec/lib/pact_broker/groups/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
 - spec/lib/pact_broker/matrix/repository_spec.rb
 - spec/lib/pact_broker/matrix/service_spec.rb
 - spec/lib/pact_broker/messages_spec.rb
@@ -1128,7 +1154,6 @@ 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
@@ -1163,6 +1188,7 @@ test_files:
 - spec/migrations/41_migrate_execution_data_spec.rb
 - spec/migrations/42_delete_ophan_webhook_data_spec.rb
 - spec/migrations/44_add_provider_version_to_verification_spec.rb
+- spec/migrations/change_migration_strategy_spec.rb
 - spec/service_consumers/pact_helper.rb
 - spec/service_consumers/provider_states_for_pact_broker_client.rb
 - spec/spec_helper.rb

data/lib/pact_broker/ui/views/relationships/show-prod-tags.haml

@@ -1,83 +0,0 @@
-%body
-  %link{rel: 'stylesheet', href: '/css/bootstrap.min.css'}
-  %link{rel: 'stylesheet', href: '/stylesheets/relationships.css'}
-  %script{type: 'text/javascript', src:'/javascripts/jquery-2.1.1.min.js'}
-  %script{type: 'text/javascript', src:'/javascripts/jquery.tablesorter.min.js'}
-  %script{type: 'text/javascript', src:'/js/bootstrap.min.js'}
-  %nav.navbase-default.navbar-right{role: "navigation"}
-    .container
-      %ul
-        %li.navbar-right
-          %a{href: '/hal-browser/browser.html'}
-            HAL Browser
-  .container
-    %h1.page-header
-      Pacts
-    %table.table.table-bordered.table-striped{id: 'relationships'}
-      %thead
-        %th.consumer
-          Consumer
-          %span.glyphicon.glyphicon-sort.relationships-sort
-        %th.tag
-          Version
-          %span.glyphicon.glyphicon-sort.relationships-sort
-        %th.pact
-        %th.provider
-          Provider
-          %span.glyphicon.glyphicon-sort.relationships-sort
-        %th.tag
-          Version
-          %span.glyphicon.glyphicon-sort.relationships-sort
-        %th
-          Published
-        %th
-          Webhook<br>status
-        %th
-          Last<br>verified
-      %tbody
-
-      - relationships.each do | relationship |
-        %tr
-          %td.consumer
-            %a{:href => relationship.consumer_group_url}
-              = relationship.consumer_name
-          %td
-            = relationship.consumer_version_number
-            %span{style: 'color:gray'}
-              = relationship.tag_names
-          %td.pact
-            %a{:href => relationship.pact_url, :title => "View pact"}
-              %span.pact
-          %td.provider
-            %a{:href => relationship.provider_group_url}
-              = relationship.provider_name
-          %td
-            = relationship.provider_version_number
-          %td
-            = relationship.publication_date_of_latest_pact.gsub("about ", "")
-          %td{class: relationship.webhook_status}
-            - if relationship.show_webhook_status?
-              %a{:href => relationship.webhook_url}
-                = relationship.webhook_label
-
-          %td{class: relationship.verification_status, title: relationship.verification_tooltip, "data-toggle": "tooltip", "data-placement": "left"}
-            %div
-              = relationship.last_verified_date.gsub("about ", "")
-              - if relationship.warning?
-                %span.glyphicon.glyphicon-warning-sign{'aria-hidden':true}
-    %div.relationships-size
-      = relationships.size_label
-
-:javascript
-  $(function(){
-    $("#relationships").tablesorter();
-  });
-
-  $(document).ready(function(){
-    $("span.pact").load("/images/doc-text.svg");
-    $('td[data-toggle="tooltip"]').each(function(index, td){
-      //appended tooltip div screws up table if it's appended after a
-      //td, so need to append it to a div
-      $(td).tooltip({container: $(td).first()});
-    });
-  });

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

@@ -1,35 +0,0 @@
-require 'pact_broker/pacts/pact_publication'
-
-module PactBroker
-  module Pacts
-    describe PactPublication do
-
-      describe "#latest_tag_names" do
-        before do
-          td.create_pact_with_hierarchy("Foo", "1.2.3", "Bar")
-            .create_consumer_version_tag("no")
-            .create_consumer_version("3.4.5")
-            .create_consumer_version_tag("yes")
-            .create_pact
-            .create_consumer_version("5.6.7")
-            .create_consumer_version_tag("no")
-        end
-
-        let(:td) { TestDataBuilder.new }
-        let(:pact_publication) { PactPublication.find(id: td.pact.id) }
-
-        context "when the pact is the latest for a tag" do
-          it "returns the relevant tag names" do
-            expect(pact_publication.latest_tag_names).to eq ["yes"]
-          end
-        end
-
-        context "when the pact is not the latest for a tag" do
-          it "returns the relevant tag names" do
-            expect(pact_publication.latest_tag_names).to eq ["yes"]
-          end
-        end
-      end
-    end
-  end
-end