summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-15 02:34:12 +0000
committerGerrit Code Review <review@openstack.org>2017-06-15 02:34:12 +0000
commit8c54a0cd9dec4aa4571f4e2b1655b301731fd614 (patch)
treec2247d9bef2091a72fb145863d50b5e952437ead
parentfb285fabde6c6d08f6d60995a37db4fa21796d33 (diff)
parent9ebba6d43f5c0d1824162bb49a24f890e1a579cc (diff)
Merge "Modify some spelling mistakes"
-rw-r--r--doc/Makefile2
-rw-r--r--magnum_ui/static/dashboard/container-infra/cluster-templates/delete/delete.service.spec.js6
-rw-r--r--magnum_ui/static/dashboard/container-infra/clusters/delete/delete.service.spec.js6
3 files changed, 7 insertions, 7 deletions
diff --git a/doc/Makefile b/doc/Makefile
index efaeb8e..0a15a28 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -144,7 +144,7 @@ changes:
144linkcheck: 144linkcheck:
145 $(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck 145 $(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
146 @echo 146 @echo
147 @echo "Link check complete; look for any errors in the above output " \ 147 @echo "Link check complete; look for any error in the above output " \
148 "or in $(BUILDDIR)/linkcheck/output.txt." 148 "or in $(BUILDDIR)/linkcheck/output.txt."
149 149
150doctest: 150doctest:
diff --git a/magnum_ui/static/dashboard/container-infra/cluster-templates/delete/delete.service.spec.js b/magnum_ui/static/dashboard/container-infra/cluster-templates/delete/delete.service.spec.js
index 04461ae..adc3f25 100644
--- a/magnum_ui/static/dashboard/container-infra/cluster-templates/delete/delete.service.spec.js
+++ b/magnum_ui/static/dashboard/container-infra/cluster-templates/delete/delete.service.spec.js
@@ -32,7 +32,7 @@
32 }; 32 };
33 33
34 var magnumAPI = { 34 var magnumAPI = {
35 deleteEntity: function() { 35 deleteClusterTemplate: function() {
36 return; 36 return;
37 } 37 }
38 }; 38 };
@@ -58,7 +58,7 @@
58 })); 58 }));
59 59
60 beforeEach(module('horizon.app.core.openstack-service-api', function($provide) { 60 beforeEach(module('horizon.app.core.openstack-service-api', function($provide) {
61 $provide.value('horizon.app.core.openstack-service-api.mugnum', magnumAPI); 61 $provide.value('horizon.app.core.openstack-service-api.magnum', magnumAPI);
62 $provide.value('horizon.app.core.openstack-service-api.policy', policyAPI); 62 $provide.value('horizon.app.core.openstack-service-api.policy', policyAPI);
63 spyOn(policyAPI, 'ifAllowed').and.callThrough(); 63 spyOn(policyAPI, 'ifAllowed').and.callThrough();
64 })); 64 }));
@@ -126,7 +126,7 @@
126 it('should pass in a function that deletes an template', testMagnum); 126 it('should pass in a function that deletes an template', testMagnum);
127 127
128 function testMagnum() { 128 function testMagnum() {
129 spyOn(magnumAPI, 'deleteEntity'); 129 spyOn(magnumAPI, 'deleteClusterTemplate');
130 var templates = generateTemplate(1); 130 var templates = generateTemplate(1);
131 var template = templates[0]; 131 var template = templates[0];
132 service.perform(templates, $scope); 132 service.perform(templates, $scope);
diff --git a/magnum_ui/static/dashboard/container-infra/clusters/delete/delete.service.spec.js b/magnum_ui/static/dashboard/container-infra/clusters/delete/delete.service.spec.js
index b3f3d16..200c7a6 100644
--- a/magnum_ui/static/dashboard/container-infra/clusters/delete/delete.service.spec.js
+++ b/magnum_ui/static/dashboard/container-infra/clusters/delete/delete.service.spec.js
@@ -32,7 +32,7 @@
32 }; 32 };
33 33
34 var magnumAPI = { 34 var magnumAPI = {
35 deleteEntity: function() { 35 deleteCluster: function() {
36 return; 36 return;
37 } 37 }
38 }; 38 };
@@ -57,7 +57,7 @@
57 })); 57 }));
58 58
59 beforeEach(module('horizon.app.core.openstack-service-api', function($provide) { 59 beforeEach(module('horizon.app.core.openstack-service-api', function($provide) {
60 $provide.value('horizon.app.core.openstack-service-api.mugnum', magnumAPI); 60 $provide.value('horizon.app.core.openstack-service-api.magnum', magnumAPI);
61 $provide.value('horizon.app.core.openstack-service-api.policy', policyAPI); 61 $provide.value('horizon.app.core.openstack-service-api.policy', policyAPI);
62 spyOn(policyAPI, 'ifAllowed').and.callThrough(); 62 spyOn(policyAPI, 'ifAllowed').and.callThrough();
63 })); 63 }));
@@ -126,7 +126,7 @@
126 it('should pass in a function that deletes a cluster', testMagnum); 126 it('should pass in a function that deletes a cluster', testMagnum);
127 127
128 function testMagnum() { 128 function testMagnum() {
129 spyOn(magnumAPI, 'deleteEntity'); 129 spyOn(magnumAPI, 'deleteCluster');
130 var clusters = generateCluster(1); 130 var clusters = generateCluster(1);
131 var cluster = clusters[0]; 131 var cluster = clusters[0];
132 service.perform(clusters, $scope); 132 service.perform(clusters, $scope);