katello 3.14.1 → 3.15.0.rc1

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/views/content-access-mode-banner.html

@@ -1,5 +1,5 @@
 <div bst-alert="info" ng-show="contentAccessMode === 'org_environment'">
   <span translate>
-    Access to repositories is unrestricted in this organization. Hosts can consume all repositories available in the Content View they are registered to, regardless of subscription status.
+This organization has Simple Content Access enabled. Hosts can consume from all repositories in their Content View regardless of subscription status.
   </span>
 </div>

data/lib/katello/engine.rb

@@ -117,9 +117,9 @@ module Katello
     end
 
     initializer "katello.helpers" do |_app|
-      ActionView::Base.send :include, Katello::TaxonomyHelper
-      ActionView::Base.send :include, Katello::HostsAndHostgroupsHelper
-      ActionView::Base.send :include, Katello::KatelloUrlsHelper
+      ActionView::Base.include Katello::TaxonomyHelper
+      ActionView::Base.include Katello::HostsAndHostgroupsHelper
+      ActionView::Base.include Katello::KatelloUrlsHelper
     end
 
     config.to_prepare do
@@ -132,26 +132,26 @@ module Katello
       FastGettext.default_text_domain = 'katello'
 
       # Lib Extensions
-      ::Foreman::Renderer::Scope::Variables::Base.send :include, Katello::Concerns::RendererExtensions
-      ::Foreman::Renderer::Scope::Base.send :include, Katello::Concerns::BaseTemplateScopeExtensions
+      ::Foreman::Renderer::Scope::Variables::Base.include Katello::Concerns::RendererExtensions
+      ::Foreman::Renderer::Scope::Base.include Katello::Concerns::BaseTemplateScopeExtensions
 
       # Model extensions
-      ::Environment.send :include, Katello::Concerns::EnvironmentExtensions
-      ::Host::Managed.send :include, Katello::Concerns::HostManagedExtensions
-      ::Hostgroup.send :include, Katello::Concerns::HostgroupExtensions
-      ::Location.send :include, Katello::Concerns::LocationExtensions
-      ::Redhat.send :include, Katello::Concerns::RedhatExtensions
-      ::Operatingsystem.send :include, Katello::Concerns::OperatingsystemExtensions
-      ::Organization.send :include, Katello::Concerns::OrganizationExtensions
-      ::User.send :include, Katello::Concerns::UserExtensions
-      ::Setting.send :include, Katello::Concerns::SettingExtensions
-      ::HttpProxy.send :include, Katello::Concerns::HttpProxyExtensions
-      ForemanTasks::RecurringLogic.send :include, Katello::Concerns::RecurringLogicExtensions
+      ::Environment.include Katello::Concerns::EnvironmentExtensions
+      ::Host::Managed.include Katello::Concerns::HostManagedExtensions
+      ::Hostgroup.include Katello::Concerns::HostgroupExtensions
+      ::Location.include Katello::Concerns::LocationExtensions
+      ::Redhat.include Katello::Concerns::RedhatExtensions
+      ::Operatingsystem.include Katello::Concerns::OperatingsystemExtensions
+      ::Organization.include Katello::Concerns::OrganizationExtensions
+      ::User.include Katello::Concerns::UserExtensions
+      ::Setting.include Katello::Concerns::SettingExtensions
+      ::HttpProxy.include Katello::Concerns::HttpProxyExtensions
+      ForemanTasks::RecurringLogic.include Katello::Concerns::RecurringLogicExtensions
 
       #Controller extensions
-      ::HostsController.send :include, Katello::Concerns::HostsControllerExtensions
-      ::SmartProxiesController.send :include, Katello::Concerns::SmartProxiesControllerExtensions
-      ::SmartProxiesController.send :include, Katello::Concerns::SmartProxiesControllerExtensions
+      ::HostsController.include Katello::Concerns::HostsControllerExtensions
+      ::SmartProxiesController.include Katello::Concerns::SmartProxiesControllerExtensions
+      ::SmartProxiesController.include Katello::Concerns::SmartProxiesControllerExtensions
       ::FactImporter.register_fact_importer(Katello::RhsmFactName::FACT_TYPE, Katello::RhsmFactImporter)
       ::FactParser.register_fact_parser(Katello::RhsmFactName::FACT_TYPE, Katello::RhsmFactParser)
 
@@ -165,13 +165,13 @@ module Katello
       end
       #Handle Smart Proxy items separately
       begin
-        ::SmartProxy.send :include, Katello::Concerns::SmartProxyExtensions
+        ::SmartProxy.include Katello::Concerns::SmartProxyExtensions
       rescue ActiveRecord::StatementInvalid
         Rails.logger.info('Database was not initialized yet: skipping smart proxy katello extension')
       end
 
       # Organization controller extensions
-      ::OrganizationsController.send :include, Katello::Concerns::OrganizationsControllerExtensions
+      ::OrganizationsController.include Katello::Concerns::OrganizationsControllerExtensions
 
       # Service extensions
       require "#{Katello::Engine.root}/app/services/katello/puppet_class_importer_extensions"
@@ -186,12 +186,12 @@ module Katello
       require_dependency "#{Katello::Engine.root}/app/controllers/katello/api/v2/api_controller"
       require_dependency "#{Katello::Engine.root}/app/services/katello/proxy_status/pulp"
       require_dependency "#{Katello::Engine.root}/app/services/katello/proxy_status/pulp_node"
-      ::PuppetClassImporter.send :include, Katello::Services::PuppetClassImporterExtensions
+      ::PuppetClassImporter.include Katello::Services::PuppetClassImporterExtensions
 
       #Api controller extensions
-      ::Api::V2::HostsController.send :include, Katello::Concerns::Api::V2::HostsControllerExtensions
-      ::Api::V2::HostgroupsController.send :include, Katello::Concerns::Api::V2::HostgroupsControllerExtensions
-      ::Api::V2::SmartProxiesController.send :include, Katello::Concerns::Api::V2::SmartProxiesControllerExtensions
+      ::Api::V2::HostsController.include Katello::Concerns::Api::V2::HostsControllerExtensions
+      ::Api::V2::HostgroupsController.include Katello::Concerns::Api::V2::HostgroupsControllerExtensions
+      ::Api::V2::SmartProxiesController.include Katello::Concerns::Api::V2::SmartProxiesControllerExtensions
 
       ::HostsController.class_eval do
         helper Katello::Concerns::HostsAndHostgroupsHelperExtensions

data/lib/katello/plugin.rb

@@ -269,7 +269,7 @@ Foreman::Plugin.register :katello do
   register_ping_extension { Katello::Ping.ping }
   register_status_extension { Katello::Ping.status }
 
-  extend_rabl_template 'api/v2/smart_proxies/main', 'katello/api/v2/smart_proxies/download_policy'
+  extend_rabl_template 'api/v2/smart_proxies/main', 'katello/api/v2/smart_proxies/pulp_info'
   extend_rabl_template 'api/v2/hosts/show', 'katello/api/v2/hosts/host_collections'
 
   extend_page "smart_proxies/show" do |cx|

data/lib/katello/repository_types/ansible_collection.rb

@@ -2,6 +2,7 @@ Katello::RepositoryTypeManager.register(::Katello::Repository::ANSIBLE_COLLECTIO
   allow_creation_by_user true
   pulp3_skip_publication true
   pulp3_service_class Katello::Pulp3::Repository::AnsibleCollection
+  pulp3_api_class Katello::Pulp3::Api::AnsibleCollection
   pulp3_plugin 'pulp_ansible'
 
   content_type Katello::AnsibleCollection, :pulp3_service_class => ::Katello::Pulp3::AnsibleCollection, :user_removable => true

data/lib/katello/repository_types/docker.rb

@@ -2,8 +2,9 @@ Katello::RepositoryTypeManager.register(::Katello::Repository::DOCKER_TYPE) do
   service_class Katello::Pulp::Repository::Docker
   default_managed_content_type Katello::DockerManifest
   pulp3_service_class Katello::Pulp3::Repository::Docker
+  pulp3_api_class Katello::Pulp3::Api::Docker
   pulp3_skip_publication true
-  pulp3_plugin 'pulp_docker'
+  pulp3_plugin 'pulp_container'
 
   set_unique_content_per_repo
 

data/lib/katello/repository_types/file.rb

@@ -1,8 +1,8 @@
 Katello::RepositoryTypeManager.register(::Katello::Repository::FILE_TYPE) do
   allow_creation_by_user true
   service_class Katello::Pulp::Repository::File
-
   pulp3_service_class Katello::Pulp3::Repository::File
+  pulp3_api_class Katello::Pulp3::Api::File
   pulp3_plugin 'pulp_file'
 
   content_type Katello::FileUnit,

data/lib/katello/repository_types/yum.rb

@@ -1,17 +1,39 @@
 Katello::RepositoryTypeManager.register(::Katello::Repository::YUM_TYPE) do
   service_class Katello::Pulp::Repository::Yum
   pulp3_service_class Katello::Pulp3::Repository::Yum
+  pulp3_api_class Katello::Pulp3::Api::Yum
   pulp3_plugin 'pulp_rpm'
   prevent_unneeded_metadata_publish
 
   default_managed_content_type Katello::Rpm
-  content_type Katello::Rpm, :priority => 1, :pulp2_service_class => ::Katello::Pulp::Rpm, :removable => true, :uploadable => true
-  content_type Katello::ModuleStream, :priority => 2, :pulp2_service_class => ::Katello::Pulp::ModuleStream
-  content_type Katello::Erratum, :priority => 3, :pulp2_service_class => ::Katello::Pulp::Erratum
-  content_type Katello::PackageGroup, :pulp2_service_class => ::Katello::Pulp::PackageGroup
-  content_type Katello::YumMetadataFile, :pulp2_service_class => ::Katello::Pulp::YumMetadataFile
-  content_type Katello::Srpm, :pulp2_service_class => ::Katello::Pulp::Srpm, :removable => true, :uploadable => true
-  content_type Katello::Distribution, :priority => 4, :pulp2_service_class => ::Katello::Pulp::Distribution, :index => false
+  content_type Katello::Rpm,
+    :priority => 1,
+    :pulp2_service_class => ::Katello::Pulp::Rpm,
+    :pulp3_service_class => ::Katello::Pulp3::Rpm,
+    :removable => true,
+    :uploadable => true
+  content_type Katello::ModuleStream,
+    :priority => 2,
+    :pulp2_service_class => ::Katello::Pulp::ModuleStream,
+    :pulp3_service_class => ::Katello::Pulp3::ModuleStream
+  content_type Katello::Erratum, :priority => 3,
+    :pulp2_service_class => ::Katello::Pulp::Erratum,
+    :pulp3_service_class => ::Katello::Pulp3::Erratum
+  content_type Katello::PackageGroup,
+    :pulp2_service_class => ::Katello::Pulp::PackageGroup,
+    :pulp3_service_class => ::Katello::Pulp3::PackageGroup
+  content_type Katello::YumMetadataFile,
+    :pulp2_service_class => ::Katello::Pulp::YumMetadataFile,
+    :pulp3_service_class => ::Katello::Pulp3::YumMetadataFile,
+    :index_on_pulp3 => false
+  content_type Katello::Srpm,
+    :pulp2_service_class => ::Katello::Pulp::Srpm,
+    :pulp3_service_class => ::Katello::Pulp3::Srpm,
+    :removable => true, :uploadable => true
+  content_type Katello::Distribution, :priority => 4,
+    :pulp2_service_class => ::Katello::Pulp::Distribution,
+    :pulp3_service_class => ::Katello::Pulp3::Distribution,
+    :index => false
   content_type Katello::PackageCategory, :priority => 4, :pulp2_service_class => ::Katello::Pulp::PackageCategory, :index => false
 
   index_additional_data { |repo, target_repo = nil| repo.import_distribution_data(target_repo) }

data/lib/katello/tasks/pulp3_content_switchover.rake

@@ -0,0 +1,21 @@
+require File.expand_path("../engine", File.dirname(__FILE__))
+
+namespace :katello do
+  desc "Runs a Pulp 3 migration of pulp3 hrefs to pulp ids for supported content types."
+  task :pulp3_content_switchover => :environment do
+    content_types = Katello::Pulp3::Migration.content_types_for_migration
+
+    content_types.each do |content_type|
+      if content_type.model_class.where(migrated_pulp3_href: nil).any?
+        $stderr.print("ERROR: at least one #{content_type.model_class.table_name} record has migrated_pulp3_href NULL value\n")
+        exit 1
+      end
+    end
+
+    content_types.each do |content_type|
+      content_type.model_class
+        .where.not("pulp_id=migrated_pulp3_href")
+        .update_all("pulp_id = migrated_pulp3_href")
+    end
+  end
+end

data/lib/katello/tasks/pulp3_migration.rake

@@ -0,0 +1,21 @@
+namespace :katello do
+  desc "Runs a Pulp 2 to 3 Content Migration for supported types.  May be run multiple times.  Use wait=false to immediately return with a task url."
+  task :pulp3_migration => ["environment", "disable_dynflow", "check_ping"] do
+    task = ForemanTasks.async_task(Actions::Pulp3::ContentMigration, [Katello::Repository::FILE_TYPE])
+
+    if ENV['wait'].nil? || ::Foreman::Cast.to_bool(ENV['wait'])
+      until !task.pending? || task.paused?
+        sleep(20)
+        task = ForemanTasks::Task.find(task.id)
+      end
+
+      if task.result == 'error' || task.result == 'pending'
+        fail ForemanTasks::TaskError, task
+      else
+        puts _("Content Migration completed successfully")
+      end
+    else
+      puts "Migration started, you may monitor it at: https://#{Socket.gethostname}/foreman_tasks/tasks/#{task.id}"
+    end
+  end
+end

data/lib/katello/tasks/reset.rake

@@ -1,29 +1,50 @@
 namespace :katello do
   namespace :reset_backends do
-    service_stop = "sudo /sbin/service %s status > /dev/null && sudo /sbin/service %s stop"
-    service_start = "sudo /sbin/service %s start"
+    # Switch to foreman-maintain when Pulp3 services are added to it
+    service_stop = "sudo /usr/bin/systemctl status %s > /dev/null && sudo /usr/bin/systemctl stop %s"
+    service_start = "sudo /usr/bin/systemctl start %s"
+
+    task :pulp_legacy do
+      SERVICES = %w(httpd pulp_workers pulp_resource_manager pulp_celerybeat squid qpidd pulp_streamer).freeze
+
+      puts "\e[33mStarting Pulp2 Reset\e[0m\n\n"
+
+      SERVICES.each { |s| system(service_stop.gsub("%s", s)) }
+      system(service_start.gsub("%s", 'rh-mongodb34-mongod'))
+      system("mongo pulp_database --eval 'db.dropDatabase();'")
+      fail "\e[31mCannot Migrate Pulp2 Database\e[0m\n\n" unless system('sudo -u apache /usr/bin/pulp-manage-db')
+
+      SERVICES.each { |s| system(service_start.gsub("%s", s)) }
+      puts "\e[32mPulp2 Database Reset Complete\e[0m\n\n"
+    end
 
     task :pulp do
-      SERVICES = %w(httpd pulp_workers pulp_resource_manager pulp_celerybeat).freeze
-      system(service_stop.gsub("%s", "mongod"))
+      SERVICES = %w(redis pulpcore-api pulpcore-resource-manager pulpcore-content).freeze
+
+      puts "\e[33mStarting Pulp3 Reset\e[0m\n\n"
 
       SERVICES.each { |s| system(service_stop.gsub("%s", s)) }
-      system("sudo rm -rf /var/lib/mongodb/pulp_database*")
-      system(service_start.gsub("%s", "mongod"))
-      sleep(10)
-      fail "Cannot migrate pulp database" unless system("sudo -u apache /usr/bin/pulp-manage-db")
+      system("sudo systemctl stop 'pulpcore-worker@*' --all")
+      system("sudo runuser - postgres -c 'dropdb pulp -p 7878'")
+      system("sudo runuser - postgres -c 'createdb pulp -p 7878'")
+      Dir.chdir('/usr/local/lib/pulp/bin') do
+        fail "\e[31mCannot migrate Pulp3 database\e[0m\n\n" unless system("sudo -u pulp PULP_SETTINGS='/etc/pulp/settings.py' DJANGO_SETTINGS_MODULE='pulpcore.app.settings' ./django-admin migrate --no-input")
+        puts "\e[33mRecreating Admin User\e[0m\n\n"
+        system("sudo -u pulp PULP_SETTINGS='/etc/pulp/settings.py' DJANGO_SETTINGS_MODULE='pulpcore.app.settings' ./django-admin reset-admin-password --password password")
+      end
 
       SERVICES.each { |s| system(service_start.gsub("%s", s)) }
-      puts "Pulp database reset."
+      system("sudo systemctl start 'pulpcore-worker@*' --all")
+      puts "\e[32mPulp3 Database Reset Complete\e[0m\n\n"
     end
 
     task :candlepin do
-      tomcat = File.exist?('/var/lib/tomcat') ? 'tomcat' : 'tomcat6'
+      puts "\e[33mStarting Candlepin Reset\e[0m\n\n"
 
-      system(service_stop.gsub("%s", tomcat))
-      system("sudo /usr/share/candlepin/cpdb --drop --create")
-      system(service_start.gsub("%s", tomcat))
-      puts "Candlepin database reset."
+      system(service_stop.gsub("%s", 'tomcat'))
+      system('sudo /usr/share/candlepin/cpdb --drop --create')
+      system(service_start.gsub("%s", 'tomcat'))
+      puts "\e[32mCandlepin Database Reset Complete\e[0m\n\n"
     end
   end
 
@@ -33,10 +54,15 @@ namespace :katello do
     SmartProxy.where(name: hostname, url: "https://#{hostname}:9090").first_or_create!
   end
 
-  desc "Resets Foreman/Katello development environemnt. WARNING: This will destroy all your Foreman and Katello data."
+  desc 'Resets the Foreman/Katello development environment. WARNING: This will destroy all your Foreman, Katello and Pulp data.'
   task :reset_backends do
     Rake::Task['katello:reset_backends:candlepin'].invoke
-    Rake::Task['katello:reset_backends:pulp'].invoke
+    if File.exist?('/usr/local/lib/pulp/bin') # When Pulp2 is no longer on nightly we will need to change this
+      Rake::Task['katello:reset_backends:pulp'].invoke
+      Rake::Task['katello:reset_backends:pulp_legacy'].invoke
+    else
+      Rake::Task['katello:reset_backends:pulp_legacy'].invoke
+    end
   end
 
   task :reset => ['environment'] do
@@ -51,5 +77,6 @@ namespace :katello do
     system('rake db:migrate')
     system('rake db:seed')
     Rake::Task['katello:reset_default_smart_proxy'].invoke
+    puts "\e[32mReset Done\e[0m\n"
   end
 end

data/lib/katello/tasks/update_content_default_http_proxy.rake

@@ -1,7 +1,7 @@
 require File.expand_path("../engine", File.dirname(__FILE__))
 
 namespace :katello do
-  desc "Sets the content default http proxy to an existing http proxy based on supplied URL."
+  desc "Sets the content default HTTP proxy to an existing HTTP proxy based on supplied URL."
   task :update_default_http_proxy => :environment do
     setting = ::Setting.find_by(name: 'content_default_http_proxy')
     options = {}
@@ -52,7 +52,7 @@ namespace :katello do
       setting.update_attribute(:value, http_proxy.name)
       http_proxy.update_attributes!(url: sanitized_url,
                                    username: options[:username], password: options[:password])
-      puts "Content default http proxy set to #{http_proxy.name_and_url}."
+      puts "Content default HTTP proxy set to #{http_proxy.name_and_url}."
     else
       new_proxy = ::HttpProxy.new(name: options[:name], url: sanitized_url,
                                 username: options[:username], password: options[:password],
@@ -60,7 +60,7 @@ namespace :katello do
                                 locations: Location.all)
       if new_proxy.save!
         setting.update_attribute(:value, new_proxy.name)
-        puts "Default content http proxy set to #{new_proxy.name_and_url}."
+        puts "Default content HTTP proxy set to #{new_proxy.name_and_url}."
       end
     end
 

data/lib/katello/tasks/upgrades/3.15/reindex_rpm_modular.rake

@@ -0,0 +1,23 @@
+namespace :katello do
+  namespace :upgrades do
+    namespace '3.15' do
+      desc "Reindex the is_modular attribute of an rpm"
+      task :reindex_rpm_modular, [:input_file] => ["environment"] do
+        User.current = User.anonymous_api_admin
+        criteria = { :fields => [],
+                     :limit => SETTINGS[:katello][:pulp][:bulk_load_size],
+                     :skip => 0,
+                     :filters => {'is_modular' => {'$eq' => true}}
+                   }
+        content_type = Katello.pulp_server.extensions.rpm.content_type
+        batch = ::Katello::Pulp::PulpContentUnit.pulp_units_batch(criteria, criteria[:limit]) do
+          Katello.pulp_server.resources.unit.search(content_type, criteria)
+        end
+        pulp_modular_ids = batch.map { |response| response.pluck("_id") }.flatten
+        db_modular_ids = ::Katello::Rpm.modular.pluck(:pulp_id)
+        ::Katello::Rpm.where(pulp_id: db_modular_ids - pulp_modular_ids).update_all(modular: false)
+        ::Katello::Rpm.where(pulp_id: pulp_modular_ids - db_modular_ids).update_all(modular: true)
+      end
+    end
+  end
+end

data/lib/katello/tasks/upgrades/3.15/set_sub_facet_dmi_uuid.rake

@@ -0,0 +1,16 @@
+namespace :katello do
+  namespace :upgrades do
+    namespace '3.15' do
+      desc "Set the DMI UUID on Host::SubscriptionFacet from facts"
+      task :set_sub_facet_dmi_uuid, [:input_file] => ["environment"] do
+        User.current = User.anonymous_api_admin
+        dmi_uuid_fact_name = Katello::RhsmFactName.find_by_name('dmi::system::uuid') || -1
+
+        fact_values = ::FactValue.where(fact_name: dmi_uuid_fact_name).where.not(value: nil)
+        fact_values.each do |fv|
+          fv.host.subscription_facet&.update_attributes(dmi_uuid: fv.value)
+        end
+      end
+    end
+  end
+end

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "3.14.1".freeze
+  VERSION = "3.15.0.rc1".freeze
 end

data/package.json

@@ -23,18 +23,15 @@
     "url": "https://projects.theforeman.org/projects/katello/issues"
   },
   "devDependencies": {
+    "@babel/core": "^7.7.0",
     "@storybook/react": "^3.2.17",
     "@storybook/storybook-deployer": "^2.0.0",
-    "@theforeman/vendor-dev": "^1.4.0",
+    "@theforeman/builder": "^4.0.2",
+    "@theforeman/vendor-dev": "^3.8.0",
     "axios-mock-adapter": "^1.10.0",
-    "babel-core": "^6.26.3",
     "babel-eslint": "^10.0.3",
-    "babel-jest": "^23.4.0",
-    "babel-plugin-transform-class-properties": "^6.24.1",
-    "babel-plugin-transform-object-rest-spread": "^6.26.0",
-    "babel-polyfill": "^6.26.0",
-    "babel-preset-env": "^1.6.0",
-    "babel-preset-react": "^6.24.1",
+    "babel-jest": "^24.9.0",
+    "babel-loader": "^8.0.0",
     "coveralls": "^3.0.0",
     "cross-env": "^5.2.0",
     "enzyme": "^3.4.0",
@@ -49,14 +46,13 @@
     "eslint-plugin-promise": "^4.2.1",
     "eslint-plugin-react": "^7.4.0",
     "identity-obj-proxy": "^3.0.0",
-    "jest": "^23.4.1",
+    "jest": "^24.9.0",
     "prettier": "^1.7.4",
     "react-redux-test-utils": "^0.1.1",
     "react-test-renderer": "^16.0.0",
     "redux-mock-store": "^1.3.0"
   },
   "dependencies": {
-    "@theforeman/vendor": "^1.4.0",
     "angular": "1.5.5",
     "bootstrap-select": "1.12.4",
     "downshift": "^1.28.0",
@@ -66,6 +62,9 @@
     "react-bootstrap": "^0.32.1",
     "react-helmet": "^5.2.0"
   },
+  "peerDependencies": {
+    "@theforeman/vendor": ">= 3.8.0"
+  },
   "jest": {
     "collectCoverage": true,
     "collectCoverageFrom": [

data/webpack/components/WithOrganization/__snapshots__/withOrganization.test.js.snap

@@ -28,27 +28,6 @@ exports[`subscriptions page should render select org page 1`] = `
         "subscribe": [Function],
       }
     }
-    storeSubscription={
-      Subscription {
-        "listeners": Object {
-          "clear": [Function],
-          "get": [Function],
-          "notify": [Function],
-          "subscribe": [Function],
-        },
-        "onStateChange": [Function],
-        "parentSub": undefined,
-        "store": Object {
-          "clearActions": [Function],
-          "dispatch": [Function],
-          "getActions": [Function],
-          "getState": [Function],
-          "replaceReducer": [Function],
-          "subscribe": [Function],
-        },
-        "unsubscribe": [Function],
-      }
-    }
   >
     <Header
       title="Select Organization"
@@ -105,27 +84,6 @@ exports[`subscriptions page should render the wrapped component 1`] = `
         "subscribe": [Function],
       }
     }
-    storeSubscription={
-      Subscription {
-        "listeners": Object {
-          "clear": [Function],
-          "get": [Function],
-          "notify": [Function],
-          "subscribe": [Function],
-        },
-        "onStateChange": [Function],
-        "parentSub": undefined,
-        "store": Object {
-          "clearActions": [Function],
-          "dispatch": [Function],
-          "getActions": [Function],
-          "getState": [Function],
-          "replaceReducer": [Function],
-          "subscribe": [Function],
-        },
-        "unsubscribe": [Function],
-      }
-    }
   >
     <WrappedComponent
       default={[Function]}
@@ -142,27 +100,6 @@ exports[`subscriptions page should render the wrapped component 1`] = `
           "subscribe": [Function],
         }
       }
-      storeSubscription={
-        Subscription {
-          "listeners": Object {
-            "clear": [Function],
-            "get": [Function],
-            "notify": [Function],
-            "subscribe": [Function],
-          },
-          "onStateChange": [Function],
-          "parentSub": undefined,
-          "store": Object {
-            "clearActions": [Function],
-            "dispatch": [Function],
-            "getActions": [Function],
-            "getState": [Function],
-            "replaceReducer": [Function],
-            "subscribe": [Function],
-          },
-          "unsubscribe": [Function],
-        }
-      }
     >
       <div>
          Wrapped!