Changed view logic and simplified test selectors

2 files changed, 7 insertions, 10 deletions

diff --git a/app/assets/javascripts/registry/components/app.vue b/app/assets/javascripts/registry/components/app.vue
index 243e5282bb8..2f349c19f65 100644
--- a/app/assets/javascripts/registry/components/app.vue
+++ b/app/assets/javascripts/registry/components/app.vue
@@ -92,7 +92,9 @@ export default {
     this.setMainEndpoint(this.endpoint);
   },
   mounted() {
-    this.fetchRepos();
+    if (!this.characterError) {
+      this.fetchRepos();
+    }
   },
   methods: {
     ...mapActions(['setMainEndpoint', 'fetchRepos']),
@@ -111,16 +113,16 @@ export default {
       </template>
     </gl-empty-state>
 
-    <gl-loading-icon v-else-if="isLoading && !characterError" size="md" class="prepend-top-16" />
+    <gl-loading-icon v-else-if="isLoading" size="md" class="prepend-top-16" />
 
-    <div v-else-if="!isLoading && !characterError && repos.length">
+    <div v-else-if="!isLoading && repos.length">
       <h4>{{ s__('ContainerRegistry|Container Registry') }}</h4>
       <p v-html="introText"></p>
       <collapsible-container v-for="item in repos" :key="item.id" :repo="item" />
     </div>
 
     <gl-empty-state
-      v-else-if="!isLoading && !characterError && !repos.length"
+      v-else
       :title="s__('ContainerRegistry|There are no container images stored for this project')"
       :svg-path="noContainersImage"
       class="container-message"
diff --git a/spec/javascripts/registry/components/app_spec.js b/spec/javascripts/registry/components/app_spec.js
index 5ed4654675f..1808b8558ba 100644
--- a/spec/javascripts/registry/components/app_spec.js
+++ b/spec/javascripts/registry/components/app_spec.js
@@ -84,12 +84,7 @@ describe('Registry List', () => {
 
     it('should render empty message', done => {
       setTimeout(() => {
-        expect(
-          vm.$el
-            .querySelector('p')
-            .textContent.trim()
-            .replace(/[\r\n]+/g, ' '),
-        ).toContain(
+        expect(vm.$el.querySelector('p > p').textContent).toEqual(
           'With the Container Registry, every project can have its own space to store its Docker images. More Information',
         );
         done();