feat: proposals for changes incorporated, tests started

webapp/components/ContributionForm/ContributionForm.spec.js

@@ -235,7 +235,7 @@ describe('ContributionForm.vue', () => {
           expect(mocks.$apollo.mutate).toHaveBeenCalledWith(expect.objectContaining(expectedParams))
         })
 
-        it('deleted a teaser image', async () => {
+        it('deletes a teaser image', async () => {
           expectedParams.variables.imageUpload = imageUpload
           wrapper.find(TeaserImage).vm.$emit('addTeaserImage', imageUpload)
           wrapper.find(TeaserImage).vm.$emit('deleteImage', null)

webapp/components/ContributionForm/ContributionForm.vue

@@ -7,23 +7,23 @@
     @submit="submit"
   >
     <template slot-scope="{ errors }">
-      <ds-button
+      <base-button
         v-if="(contribution && contribution.image) || form.teaserImage"
         @click.prevent="deleteImage"
         icon="close"
         class="delete-image"
-      ></ds-button>
+      ></base-button>
       <hc-teaser-image
+        :class="{ '--blur-image': form.blurImage }"
         ref="deleteImage"
         :contribution="contribution"
         @addTeaserImage="addTeaserImage"
-        :class="{ '--blur-image': form.blurImage }"
         @addImageAspectRatio="addImageAspectRatio"
       >
         <img
           v-if="contribution"
           class="contribution-image"
-          :src="contribution.image || proxyApiUrl"
+          :src="contribution.image | proxyApiUrl"
         />
       </hc-teaser-image>
 

webapp/components/MasonryGrid/MasonryGrid.spec.js

@@ -16,7 +16,7 @@ describe('MasonryGrid', () => {
   it('adds the "reset-grid-height" class when itemsCalculating is more than 0', () => {
     wrapper.setData({ itemsCalculating: 1 })
 
-    expect(wrapper.classes()).toContain('reset-grid-height')
+    expect(wrapper.classes()).toContain('ds-grid')
   })
 
   it('removes the "reset-grid-height" class when itemsCalculating is 0', () => {