diff --git a/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-packages-applicable.html b/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-packages-applicable.html
index 25253e29c48..bde628a22ce 100644
--- a/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-packages-applicable.html
+++ b/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-packages-applicable.html
@@ -22,11 +22,11 @@
-
-
-
-
You currently don't have any Content Hosts, you can register one by clicking the button on the right and following the instructions.
diff --git a/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/apply-errata.controller.js b/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/apply-errata.controller.js
index 994eaaddbf7..89bcecada59 100644
--- a/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/apply-errata.controller.js
+++ b/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/apply-errata.controller.js
@@ -43,7 +43,6 @@ angular.module('Bastion.errata').controller('ApplyErrataController',
$scope.applyingErrata = false;
$scope.remoteExecutionPresent = BastionConfig.remoteExecutionPresent;
- $scope.remoteExecutionByDefault = BastionConfig.remoteExecutionByDefault;
$scope.errataActionFormValues = {
authenticityToken: $window.AUTH_TOKEN.replace(/"/g, ''),
errata: IncrementalUpdate.getErrataIds().join(','),
@@ -144,7 +143,7 @@ angular.module('Bastion.errata').controller('ApplyErrataController',
$scope.confirmApply = function() {
$scope.applyingErrata = true;
if ($scope.updates.length === 0) {
- if ($scope.remoteExecutionPresent && $scope.remoteExecutionByDefault) {
+ if ($scope.remoteExecutionPresent) {
angular.element('#errataActionForm').submit();
} else {
applyErrata();
diff --git a/engines/bastion_katello/test/content-hosts/bulk/content-hosts-bulk-errata-modal.controller.test.js b/engines/bastion_katello/test/content-hosts/bulk/content-hosts-bulk-errata-modal.controller.test.js
index b88e93ea39b..64411b080c3 100644
--- a/engines/bastion_katello/test/content-hosts/bulk/content-hosts-bulk-errata-modal.controller.test.js
+++ b/engines/bastion_katello/test/content-hosts/bulk/content-hosts-bulk-errata-modal.controller.test.js
@@ -5,9 +5,6 @@ describe('Controller: ContentHostsBulkErrataModalController', function() {
beforeEach(module('Bastion.content-hosts', 'Bastion.test-mocks'));
beforeEach(function() {
- HostBulkAction = {
- installContent: function() {}
- };
translate = function() {};
CurrentOrganization = 'foo';
selectedErrata = [1, 2, 3, 4]
@@ -54,16 +51,11 @@ describe('Controller: ContentHostsBulkErrataModalController', function() {
}));
it("can install errata on multiple content hosts", function () {
- spyOn(HostBulkAction, 'installContent');
$scope.installErrata();
- expect(HostBulkAction.installContent).toHaveBeenCalledWith(
- _.extend(hostIds, {
- content_type: 'errata',
- content: [1, 2, 3]
- }),
- jasmine.any(Function), jasmine.any(Function)
- );
+ expect($scope.errataActionFormValues.remoteAction).toEqual('errata_install');
+ expect($scope.errataActionFormValues.bulkHostIds).toBe(angular.toJson({ included: { ids: [1,2,3] }}));
+ expect($scope.errataActionFormValues.bulkErrataIds).toBe(angular.toJson( [1,2,3,4] ));
});
it("provides a function for closing the modal", function () {
diff --git a/engines/bastion_katello/test/content-hosts/bulk/content-hosts-bulk-packages-modal.controller.test.js b/engines/bastion_katello/test/content-hosts/bulk/content-hosts-bulk-packages-modal.controller.test.js
index 1d37f8773d0..67db16d5955 100644
--- a/engines/bastion_katello/test/content-hosts/bulk/content-hosts-bulk-packages-modal.controller.test.js
+++ b/engines/bastion_katello/test/content-hosts/bulk/content-hosts-bulk-packages-modal.controller.test.js
@@ -53,115 +53,85 @@ describe('Controller: ContentHostsBulkPackagesModalController', function() {
it("can install packages on multiple content hosts", function() {
$scope.content = {
action: 'install',
- contentType: 'package',
- content: 'zip, zsh, xterm'
+ contentType: 'package'
};
+ $scope.remoteExecutionPresent = true;
spyOn(HostBulkAction, 'installContent');
$scope.performContentAction();
- expect(HostBulkAction.installContent).toHaveBeenCalledWith(
- _.extend({}, hostIds, {
- content_type: $scope.content.contentType,
- content: $scope.content.content.split(/ *, */)
- }),
- jasmine.any(Function), jasmine.any(Function)
- );
+ expect($scope.packageActionFormValues.remoteAction).toEqual('package_install');
+ expect($scope.packageActionFormValues.bulkHostIds).toBe(angular.toJson({ included: { ids: [1,2,3] }}));
});
it("can update packages on multiple content hosts", function() {
$scope.content = {
action: 'update',
contentType: 'package',
- content: 'zip, zsh, xterm'
};
+ $scope.remoteExecutionPresent = true;
spyOn(HostBulkAction, 'updateContent');
$scope.performContentAction();
- expect(HostBulkAction.updateContent).toHaveBeenCalledWith(
- _.extend({}, hostIds, {
- content_type: $scope.content.contentType,
- content: $scope.content.content.split(/ *, */)
- }),
- jasmine.any(Function), jasmine.any(Function)
- );
+ expect($scope.packageActionFormValues.remoteAction).toEqual('package_update');
+ expect($scope.packageActionFormValues.bulkHostIds).toBe(angular.toJson({ included: { ids: [1,2,3] }}));
});
it("can remove packages on multiple content hosts", function() {
$scope.content = {
action: 'remove',
contentType: 'package',
- content: 'zip, zsh, xterm'
};
+ $scope.remoteExecutionPresent = true;
spyOn(HostBulkAction, 'removeContent');
$scope.performContentAction();
- expect(HostBulkAction.removeContent).toHaveBeenCalledWith(
- _.extend({}, hostIds, {
- content_type: $scope.content.contentType,
- content: $scope.content.content.split(/ *, */)
- }),
- jasmine.any(Function), jasmine.any(Function)
- );
+ expect($scope.packageActionFormValues.remoteAction).toEqual('package_remove');
+ expect($scope.packageActionFormValues.bulkHostIds).toBe(angular.toJson({ included: { ids: [1,2,3] }}));
});
it("can install package groups on multiple content hosts", function() {
$scope.content = {
action: 'install',
- contentType: 'package_group',
- content: 'Backup Client, Development Tools'
+ contentType: 'package_group'
};
+ $scope.remoteExecutionPresent = true;
spyOn(HostBulkAction, 'installContent');
$scope.performContentAction();
- expect(HostBulkAction.installContent).toHaveBeenCalledWith(
- _.extend({}, hostIds, {
- content_type: $scope.content.contentType,
- content: $scope.content.content.split(/ *, */)
- }),
- jasmine.any(Function), jasmine.any(Function)
- );
+ expect($scope.packageActionFormValues.remoteAction).toEqual('group_install');
+ expect($scope.packageActionFormValues.bulkHostIds).toBe(angular.toJson({ included: { ids: [1,2,3] }}));
});
it("can update package groups on multiple content hosts", function() {
$scope.content = {
action: 'update',
- contentType: 'package_group',
- content: 'Backup Client, Development Tools'
+ contentType: 'package_group'
};
+ $scope.remoteExecutionPresent = true;
spyOn(HostBulkAction, 'updateContent');
$scope.performContentAction();
- expect(HostBulkAction.updateContent).toHaveBeenCalledWith(
- _.extend({}, hostIds, {
- content_type: $scope.content.contentType,
- content: $scope.content.content.split(/ *, */)
- }),
- jasmine.any(Function), jasmine.any(Function)
- );
+ expect($scope.packageActionFormValues.remoteAction).toEqual('group_update');
+ expect($scope.packageActionFormValues.bulkHostIds).toBe(angular.toJson({ included: { ids: [1,2,3] }}));
});
it("can remove package groups on multiple content hosts", function() {
$scope.content = {
action: 'remove',
- contentType: 'package_group',
- content: 'Backup Client, Development Tools'
+ contentType: 'package_group'
};
+ $scope.remoteExecutionPresent = true;
spyOn(HostBulkAction, 'removeContent');
$scope.performContentAction();
- expect(HostBulkAction.removeContent).toHaveBeenCalledWith(
- _.extend({}, hostIds, {
- content_type: $scope.content.contentType,
- content: $scope.content.content.split(/ *, */)
- }),
- jasmine.any(Function), jasmine.any(Function)
- );
+ expect($scope.packageActionFormValues.remoteAction).toEqual('group_remove');
+ expect($scope.packageActionFormValues.bulkHostIds).toBe(angular.toJson({ included: { ids: [1,2,3] }}));
});
it("provides a function for closing the modal", function () {
diff --git a/engines/bastion_katello/test/content-hosts/content/content-host-errata.controller.test.js b/engines/bastion_katello/test/content-hosts/content/content-host-errata.controller.test.js
index 1c24d2c640e..130e1883e7d 100644
--- a/engines/bastion_katello/test/content-hosts/content/content-host-errata.controller.test.js
+++ b/engines/bastion_katello/test/content-hosts/content/content-host-errata.controller.test.js
@@ -103,20 +103,9 @@ describe('Controller: ContentHostErrataController', function() {
expect($scope.controllerName).toBe("katello_errata");
});
- it("provide a way to apply errata", function() {
- var bulk_errata_ids = angular.toJson({included: { ids: [mockErratum.errata_id], params: {} }});
-
- spyOn(HostErratum, "apply").and.callThrough();
- spyOn($scope.table, "selectAll");
- spyOn($scope, "transitionTo");
- $scope.applySelected();
- expect(HostErratum.apply).toHaveBeenCalledWith({id: host.id, bulk_errata_ids: bulk_errata_ids}, jasmine.any(Function));
- expect($scope.transitionTo).toHaveBeenCalledWith('content-host.tasks.details', {taskId: mockTask.id});
- expect($scope.table.selectAll).toHaveBeenCalledWith(false);
- });
-
it("can apply errata with remote execution", function() {
- $scope.remoteExecutionByDefault = true;
+ // Removed the test to apply errata because this one now covers it with REX being the only way
+ $scope.remoteExecutionPresent = true;
$scope.applySelected();
diff --git a/engines/bastion_katello/test/content-hosts/content/content-host-packages-applicable.controller.test.js b/engines/bastion_katello/test/content-hosts/content/content-host-packages-applicable.controller.test.js
index 09d8ad0eafb..3df9ab7d640 100644
--- a/engines/bastion_katello/test/content-hosts/content/content-host-packages-applicable.controller.test.js
+++ b/engines/bastion_katello/test/content-hosts/content/content-host-packages-applicable.controller.test.js
@@ -37,7 +37,6 @@ describe('Controller: ContentHostPackagesApplicableController', function() {
$scope.openEventInfo = function(){};
$scope.errorHandler = function(){};
$scope.performViaRemoteExecution = function() {};
- $scope.performViaKatelloAgent = function() {};
Package = $injector.get('MockResource').$new();
@@ -60,18 +59,10 @@ describe('Controller: ContentHostPackagesApplicableController', function() {
expect($scope.getSelectedPackages()[0]).toBe("foo-3-14.noarch");
});
- it("performs default action as appropriate for katello agent", function() {
- spyOn($scope, 'performViaKatelloAgent');
- $scope.remoteExecutionByDefault = false;
- $scope.performDefaultUpdateAction();
-
- expect($scope.performViaKatelloAgent).toHaveBeenCalledWith('packageUpdate', $scope.getKatelloAgentCommand());
- });
-
it("performs default action as appropriate for rex", function() {
spyOn($scope, 'performViaRemoteExecution');
- $scope.remoteExecutionByDefault = true;
- $scope.performDefaultUpdateAction();
+ $scope.remoteExecutionPresent = true;
+ $scope.performRexUpdate();
expect($scope.performViaRemoteExecution).toHaveBeenCalledWith('packageUpdate', $scope.getRemoteExecutionCommand(), false);
});
diff --git a/engines/bastion_katello/test/content-hosts/content/content-host-packages.controller.test.js b/engines/bastion_katello/test/content-hosts/content/content-host-packages.controller.test.js
index 8e391588ef4..991758c59f2 100644
--- a/engines/bastion_katello/test/content-hosts/content/content-host-packages.controller.test.js
+++ b/engines/bastion_katello/test/content-hosts/content/content-host-packages.controller.test.js
@@ -58,43 +58,35 @@ describe('Controller: ContentHostPackagesController', function() {
});
it("performs a package update", function() {
- spyOn(HostPackage, 'update');
+ $scope.remoteExecutionPresent = true;
$scope.performPackageAction('packageUpdate', 'foo');
- expect(HostPackage.update).toHaveBeenCalledWith({id: mockHost.id, packages: ["foo"]},
- jasmine.any(Function), jasmine.any(Function));
- expect($scope.working).toBe(true);
+ expect($scope.packageActionFormValues.package).toBe('foo');
+ expect($scope.packageActionFormValues.remoteAction).toBe('packageUpdate');
+ expect($scope.packageActionFormValues.bulkHostIds).toBe(angular.toJson({ included: { ids: [23434] }}));
+ expect($scope.packageActionFormValues.customize).toBe(false);
});
it("performs a package update with multiple packages", function() {
- spyOn(HostPackage, 'update');
- $scope.performPackageAction('packageUpdate', 'foo, bar');
- expect(HostPackage.update).toHaveBeenCalledWith({id: mockHost.id, packages: ["foo", "bar"]},
- jasmine.any(Function), jasmine.any(Function));
- expect($scope.working).toBe(true);
+ $scope.remoteExecutionPresent = true;
+ $scope.performPackageAction('packageUpdate', 'foo bar');
+ expect($scope.packageActionFormValues.package).toBe('foo bar');
+ expect($scope.packageActionFormValues.remoteAction).toBe('packageUpdate');
+ expect($scope.packageActionFormValues.bulkHostIds).toBe(angular.toJson({ included: { ids: [23434] }}));
+ expect($scope.packageActionFormValues.customize).toBe(false);
});
it("performs a package group install", function() {
- spyOn(HostPackage, 'install');
+ $scope.remoteExecutionPresent = true;
$scope.performPackageAction('groupInstall', 'bigGroup');
- expect(HostPackage.install).toHaveBeenCalledWith({id: mockHost.id, groups: ["bigGroup"]},
- jasmine.any(Function), jasmine.any(Function));
- expect($scope.working).toBe(true);
- });
-
- it("provides a way to upgrade all packages", function() {
- $scope.katelloAgentPresent = true;
- $scope.remoteExecutionPresent = false;
- $scope.remoteExecutionByDefault = false;
- spyOn(HostPackage, "updateAll");
- $scope.updateAll();
- expect(HostPackage.updateAll).toHaveBeenCalledWith({id: mockHost.id}, jasmine.any(Function),
- jasmine.any(Function));
- expect($scope.working).toBe(true);
+ expect($scope.packageActionFormValues.package).toBe('bigGroup');
+ expect($scope.packageActionFormValues.remoteAction).toBe('groupInstall');
+ expect($scope.packageActionFormValues.bulkHostIds).toBe(angular.toJson({ included: { ids: [23434] }}));
+ expect($scope.packageActionFormValues.customize).toBe(false);
});
it("provides a way to upgrade all packages via remoteExecution", function() {
+ // Removed the test to update all packages because this one now covers it with REX being the only way
$scope.remoteExecutionPresent = true;
- $scope.remoteExecutionByDefault = true;
spyOn(HostPackage, "updateAll");
$scope.updateAll();
expect(HostPackage.updateAll).not.toHaveBeenCalled();
@@ -106,7 +98,6 @@ describe('Controller: ContentHostPackagesController', function() {
it("performs a package install via remoteExecution", function() {
$scope.remoteExecutionPresent = true;
- $scope.remoteExecutionByDefault = true;
spyOn(HostPackage, 'install');
$scope.performPackageAction('packageInstall', 'foo, bar, baz');
expect(HostPackage.install).not.toHaveBeenCalled();
@@ -115,12 +106,4 @@ describe('Controller: ContentHostPackagesController', function() {
expect($scope.packageActionFormValues.bulkHostIds).toEqual('{"included":{"ids":[' + mockHost.id + ']}}');
expect($scope.working).toBe(true);
});
-
- it("performs a multi package install via katello agent", function() {
- spyOn(HostPackage, 'install');
- $scope.performPackageAction('packageInstall', 'foo, bar, baz');
- expect(HostPackage.install).toHaveBeenCalledWith({id: mockHost.id, packages: ["foo","bar","baz"]},
- jasmine.any(Function), jasmine.any(Function));
- expect($scope.working).toBe(true);
- });
});
diff --git a/engines/bastion_katello/test/errata/apply-errata.controller.test.js b/engines/bastion_katello/test/errata/apply-errata.controller.test.js
index ea3fcf14ea5..172d0635d65 100644
--- a/engines/bastion_katello/test/errata/apply-errata.controller.test.js
+++ b/engines/bastion_katello/test/errata/apply-errata.controller.test.js
@@ -6,7 +6,7 @@ describe('Controller: ApplyErrataController', function() {
beforeEach(inject(function($injector, $window) {
$controller = $injector.get('$controller'),
- BastionConfig = { remoteExecutionPresent: false, remoteExecutionByDefault: false }
+ BastionConfig = { remoteExecutionPresent: false }
$window.AUTH_TOKEN = 'secret_token';
translate = function (string) {
@@ -81,7 +81,7 @@ describe('Controller: ApplyErrataController', function() {
it("can apply errata with remote execution", function () {
var bulkContentHosts;
- dependencies.BastionConfig = { remoteExecutionPresent: true, remoteExecutionByDefault: true }
+ dependencies.BastionConfig = { remoteExecutionPresent: true }
bulkContentHosts = {
included: {