Merge pull request #226 from kevana/karma-fix

kevana · web-flow · commit 2754aefc67ca · 2016-07-12T11:43:34.000-05:00
Fix unit tests
diff --git a/README.md b/README.md
@@ -19,7 +19,7 @@ UI For Docker is a web interface for the Docker Remote API.  The goal is to prov
 
 
 
-Bind mounting the Unix socket into the UI For Docker container is much more secure than exposing your docker daemon over TCP. The `--privileged` flag is required for hosts using SELinux. You should still secure your UI For Docker instance behind some type of auth. Directions for using Nginx auth are [here](https://github.com/kevana/ui-for-docker/wiki/Dockerui-with-Nginx-HTTP-Auth).
+Bind mounting the Unix socket into the UI For Docker container is much more secure than exposing your docker daemon over TCP. The `--privileged` flag is required for hosts using SELinux. You should still secure your UI For Docker instance behind some type of auth. Directions for using Nginx auth are [here](https://github.com/kevana/ui-for-docker/wiki/UI-for-Docker-with-Nginx-HTTP-Auth).
 
 ### Specify socket to connect to Docker daemon
 
diff --git a/app/app.js b/app/app.js
@@ -1,8 +1,8 @@
 angular.module('uifordocker', [
     'uifordocker.templates',
     'ngRoute',
-    'dockerui.services',
-    'dockerui.filters',
+    'uifordocker.services',
+    'uifordocker.filters',
     'masthead',
     'footer',
     'dashboard',
diff --git a/app/shared/filters.js b/app/shared/filters.js
@@ -1,4 +1,4 @@
-angular.module('dockerui.filters', [])
+angular.module('uifordocker.filters', [])
     .filter('truncate', function () {
         'use strict';
         return function (text, length, end) {
diff --git a/app/shared/services.js b/app/shared/services.js
@@ -1,4 +1,4 @@
-angular.module('dockerui.services', ['ngResource', 'ngSanitize'])
+angular.module('uifordocker.services', ['ngResource', 'ngSanitize'])
     .factory('Container', ['$resource', 'Settings', function ContainerFactory($resource, Settings) {
         'use strict';
         // Resource for interacting with the docker containers
diff --git a/test/unit/app/components/containerController.spec.js b/test/unit/app/components/containerController.spec.js
@@ -1,7 +1,7 @@
 describe('ContainerController', function () {
     var $scope, $httpBackend, mockContainer, $routeParams;
 
-    beforeEach(module('dockerui'));
+    beforeEach(module('uifordocker'));
 
 
     beforeEach(inject(function ($rootScope, $controller, _$routeParams_) {
@@ -20,10 +20,14 @@ describe('ContainerController', function () {
 
     function expectGetContainer() {
         $httpBackend.expectGET('dockerapi/containers/json').respond({
-            'Created': 1421817232,
-            'id': 'b17882378cee8ec0136f482681b764cca430befd52a9bfd1bde031f49b8bba9f',
-            'Image': 'dockerui:latest',
-            'Name': '/dockerui'
+            Created: 1421817232,
+            id: 'b17882378cee8ec0136f482681b764cca430befd52a9bfd1bde031f49b8bba9f',
+            Image: 'ui-for-docker:latest',
+            Name: '/ui-for-docker',
+            Config: {},
+            HostConfig: {
+                Binds: []
+            }
         });
     }
 
@@ -33,8 +37,8 @@ describe('ContainerController', function () {
         $scope.container = {
             'Created': 1421817232,
             'id': 'b17882378cee8ec0136f482681b764cca430befd52a9bfd1bde031f49b8bba9f',
-            'Image': 'dockerui:latest',
-            'Name': '/dockerui'
+            'Image': 'ui-for-docker:latest',
+            'Name': '/ui-for-docker'
         };
         $scope.container.newContainerName = "newName";
 
diff --git a/test/unit/app/components/containerTopController.spec.js b/test/unit/app/components/containerTopController.spec.js
@@ -1,7 +1,7 @@
 describe("ContainerTopController", function () {
     var $scope, $httpBackend, $routeParams;
 
-    beforeEach(angular.mock.module('dockerui'));
+    beforeEach(angular.mock.module('uifordocker'));
 
     beforeEach(inject(function (_$rootScope_, _$httpBackend_, $controller, _$routeParams_) {
         $scope = _$rootScope_.$new();
diff --git a/test/unit/app/components/networkController.spec.js b/test/unit/app/components/networkController.spec.js
@@ -1,7 +1,7 @@
 describe('NetworkController', function () {
     var $scope, $httpBackend, $routeParams;
 
-    beforeEach(module('dockerui'));
+    beforeEach(module('uifordocker'));
     beforeEach(inject(function (_$httpBackend_, $controller, _$routeParams_) {
         $scope = {};
         $httpBackend = _$httpBackend_;
diff --git a/test/unit/app/components/networksController.spec.js b/test/unit/app/components/networksController.spec.js
@@ -1,7 +1,7 @@
 describe('NetworksController', function () {
     var $scope, $httpBackend, $routeParams;
 
-    beforeEach(module('dockerui'));
+    beforeEach(module('uifordocker'));
     beforeEach(inject(function (_$httpBackend_, $controller, _$routeParams_) {
         $scope = {};
         $httpBackend = _$httpBackend_;
diff --git a/test/unit/app/components/startContainerController.spec.js b/test/unit/app/components/startContainerController.spec.js
@@ -1,7 +1,7 @@
 describe('startContainerController', function () {
     var scope, $location, createController, mockContainer, $httpBackend;
 
-    beforeEach(angular.mock.module('dockerui'));
+    beforeEach(angular.mock.module('uifordocker'));
 
     beforeEach(inject(function ($rootScope, $controller, _$location_) {
         $location = _$location_;
@@ -20,11 +20,11 @@ describe('startContainerController', function () {
     }));
     function expectGetContainers() {
         $httpBackend.expectGET('dockerapi/containers/json?all=1').respond([{
-            'Command': './dockerui -e /docker.sock',
+            'Command': './ui-for-docker -e /docker.sock',
             'Created': 1421817232,
             'Id': 'b17882378cee8ec0136f482681b764cca430befd52a9bfd1bde031f49b8bba9f',
-            'Image': 'dockerui:latest',
-            'Names': ['/dockerui'],
+            'Image': 'ui-for-docker:latest',
+            'Names': ['/ui-for-docker'],
             'Ports': [{
                 'IP': '0.0.0.0',
                 'PrivatePort': 9000,
@@ -199,9 +199,15 @@ describe('startContainerController', function () {
                     }],
                     LxcConf: {'lxc.utsname': 'docker'},
                     ExtraHosts: ['hostname:127.0.0.1'],
+                    PublishAllPorts: true,
+                    Privileged: true,
                     RestartPolicy: {name: 'always', MaximumRetryCount: 5}
                 },
-                name: 'container-name'
+                name: 'container-name',
+                NetworkDisabled: true,
+                Tty: true,
+                OpenStdin: true,
+                StdinOnce: true
             };
 
             expectGetContainers();
diff --git a/test/unit/app/components/statsController.spec.js b/test/unit/app/components/statsController.spec.js
@@ -1,7 +1,7 @@
 describe("StatsController", function () {
     var $scope, $httpBackend, $routeParams;
 
-    beforeEach(angular.mock.module('dockerui'));
+    beforeEach(angular.mock.module('uifordocker'));
 
     beforeEach(inject(function (_$rootScope_, _$httpBackend_, $controller, _$routeParams_) {
         $scope = _$rootScope_.$new();
diff --git a/test/unit/app/components/volumesController.spec.js b/test/unit/app/components/volumesController.spec.js
@@ -1,7 +1,7 @@
 describe('VolumesController', function () {
     var $scope, $httpBackend, $routeParams;
 
-    beforeEach(module('dockerui'));
+    beforeEach(module('uifordocker'));
     beforeEach(inject(function (_$httpBackend_, $controller, _$routeParams_) {
         $scope = {};
         $httpBackend = _$httpBackend_;
diff --git a/test/unit/app/shared/filters.spec.js b/test/unit/app/shared/filters.spec.js
@@ -1,5 +1,5 @@
 describe('filters', function () {
-    beforeEach(module('dockerui.filters'));
+    beforeEach(module('uifordocker.filters'));
 
     describe('truncate', function () {
         it('should truncate the string to 10 characters ending in "..." by default', inject(function (truncateFilter) {
diff --git a/test/unit/karma.conf.js b/test/unit/karma.conf.js
@@ -7,7 +7,7 @@ files = [
     JASMINE_ADAPTER,
     'dist/angular.js',
     'dist/vendor.js',
-    'dist/dockerui.js',
+    'dist/uifordocker.js',
     'bower_components/angular-mocks/angular-mocks.js',
     'test/unit/**/*.spec.js'
 ];

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ UI For Docker is a web interface for the Docker Remote API. The goal is to prov`
`19`	`19`
`20`	`20`
`21`	`21`
`22`		-Bind mounting the Unix socket into the UI For Docker container is much more secure than exposing your docker daemon over TCP. The `--privileged` flag is required for hosts using SELinux. You should still secure your UI For Docker instance behind some type of auth. Directions for using Nginx auth are [here](https://github.com/kevana/ui-for-docker/wiki/Dockerui-with-Nginx-HTTP-Auth).
	`22`	+Bind mounting the Unix socket into the UI For Docker container is much more secure than exposing your docker daemon over TCP. The `--privileged` flag is required for hosts using SELinux. You should still secure your UI For Docker instance behind some type of auth. Directions for using Nginx auth are [here](https://github.com/kevana/ui-for-docker/wiki/UI-for-Docker-with-Nginx-HTTP-Auth).
`23`	`23`
`24`	`24`	`### Specify socket to connect to Docker daemon`
`25`	`25`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-angular.module('dockerui.filters', [])`
	`1`	`+angular.module('uifordocker.filters', [])`
`2`	`2`	`.filter('truncate', function () {`
`3`	`3`	`'use strict';`
`4`	`4`	`return function (text, length, end) {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-angular.module('dockerui.services', ['ngResource', 'ngSanitize'])`
	`1`	`+angular.module('uifordocker.services', ['ngResource', 'ngSanitize'])`
`2`	`2`	`.factory('Container', ['$resource', 'Settings', function ContainerFactory($resource, Settings) {`
`3`	`3`	`'use strict';`
`4`	`4`	`// Resource for interacting with the docker containers`