From cebd1046c7af146c814fd848b0a04ad6083d0569 Mon Sep 17 00:00:00 2001 From: Matt Rider Date: Fri, 24 May 2019 01:26:37 -0300 Subject: [PATCH] Write cypress tests, show dropzone conditionally - If it's the user's profile, show vueDropzone, if not show just the user's avatar - apollo mutation is being called twice for drag and drop events --- cypress/fixtures/onourjourney.png | Bin 0 -> 51114 bytes cypress/integration/common/profile.js | 34 ++++++++++++++++++ cypress/integration/common/settings.js | 1 + .../UploadUserProfileImage.feature | 18 ++++++++++ cypress/support/commands.js | 2 +- package.json | 1 + webapp/components/Upload/index.vue | 5 ++- webapp/components/Upload/spec.js | 27 +++++++------- webapp/pages/profile/_id/_slug.vue | 14 ++++++-- yarn.lock | 5 +++ 10 files changed, 91 insertions(+), 16 deletions(-) create mode 100644 cypress/fixtures/onourjourney.png create mode 100644 cypress/integration/common/profile.js create mode 100644 cypress/integration/user_profile/UploadUserProfileImage.feature diff --git a/cypress/fixtures/onourjourney.png b/cypress/fixtures/onourjourney.png new file mode 100644 index 0000000000000000000000000000000000000000..8e606fabd319928c43a488ccbcdd48236e3ab4a3 GIT binary patch literal 51114 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 JOQm2z{}+(50N4Nk literal 0 HcmV?d00001 diff --git a/cypress/integration/common/profile.js b/cypress/integration/common/profile.js new file mode 100644 index 000000000..cb5689f63 --- /dev/null +++ b/cypress/integration/common/profile.js @@ -0,0 +1,34 @@ +import { When, Then } from 'cypress-cucumber-preprocessor/steps' + +/* global cy */ + +When('I visit my profile page', () => { + cy.openPage('profile/peter-pan') +}) + +Then('I should be able to change my profile picture', () => { + const avatarUpload = 'onourjourney.png' + + cy.fixture(avatarUpload, 'base64').then(fileContent => { + cy.get('#customdropzone').upload( + { fileContent, fileName: avatarUpload, mimeType: 'image/png' }, + { subjectType: 'drag-n-drop' }, + ) + }) + cy.get('#customdropzone') + .should('have.attr', 'style') + .and('contains', 'onourjourney') + cy.contains('.iziToast-message', 'Upload successful') + .should('have.length', 1) +}) + +When("I visit another user's profile page", () => { + cy.openPage('profile/peter-pan') +}) + +Then('I cannot upload a picture', () => { + cy.get('.ds-card-content') + .children() + .should('not.have.id', 'customdropzone') + .should('have.class', 'ds-avatar') +}) \ No newline at end of file diff --git a/cypress/integration/common/settings.js b/cypress/integration/common/settings.js index b6621ec87..664ffcff8 100644 --- a/cypress/integration/common/settings.js +++ b/cypress/integration/common/settings.js @@ -45,6 +45,7 @@ When('people visit my profile page', url => { cy.openPage('/profile/peter-pan') }) + When('they can see the text in the info box below my avatar', () => { cy.contains(aboutMeText) }) diff --git a/cypress/integration/user_profile/UploadUserProfileImage.feature b/cypress/integration/user_profile/UploadUserProfileImage.feature new file mode 100644 index 000000000..b46a31de8 --- /dev/null +++ b/cypress/integration/user_profile/UploadUserProfileImage.feature @@ -0,0 +1,18 @@ +Feature: Upload UserProfile Image + As a user + I would like to be able to add an avatar/profile pic to my profile + So that I can personalize my profile + + + Background: + Given I have a user account + + Scenario: Change my UserProfile Image + Given I am logged in + And I visit my profile page + Then I should be able to change my profile picture + + Scenario: Unable to change another user's avatar + Given I am logged in with a "user" role + And I visit another user's profile page + Then I cannot upload a picture \ No newline at end of file diff --git a/cypress/support/commands.js b/cypress/support/commands.js index a7cb76a27..f6253af20 100644 --- a/cypress/support/commands.js +++ b/cypress/support/commands.js @@ -13,7 +13,7 @@ // Cypress.Commands.add('login', (email, password) => { ... }) /* globals Cypress cy */ - +import 'cypress-file-upload' import { getLangByName } from './helpers' import users from '../fixtures/users.json' diff --git a/package.json b/package.json index 272e7785e..90b1aa8aa 100644 --- a/package.json +++ b/package.json @@ -23,6 +23,7 @@ "cross-env": "^5.2.0", "cypress": "^3.3.0", "cypress-cucumber-preprocessor": "^1.11.2", + "cypress-file-upload": "^3.1.2", "cypress-plugin-retries": "^1.2.1", "dotenv": "^8.0.0", "faker": "^4.1.0", diff --git a/webapp/components/Upload/index.vue b/webapp/components/Upload/index.vue index 74222b14b..3e46a09a9 100644 --- a/webapp/components/Upload/index.vue +++ b/webapp/components/Upload/index.vue @@ -36,8 +36,11 @@ export default { computed: { backgroundImage() { const { avatar } = this.user || {} + const userAvatar = avatar.startsWith('/') + ? avatar.replace('/', '/api/') + : avatar return { - backgroundImage: `url(/api${avatar})` + backgroundImage: `url(${userAvatar})` } } }, diff --git a/webapp/components/Upload/spec.js b/webapp/components/Upload/spec.js index 22eaa9b6c..52cf5bb8c 100644 --- a/webapp/components/Upload/spec.js +++ b/webapp/components/Upload/spec.js @@ -13,10 +13,14 @@ describe('Upload', () => { const mocks = { $apollo: { - mutate: jest.fn().mockResolvedValueOnce({ - data: { UpdateUser: { id: 'upload1', avatar: '/upload/avatar.jpg' } } - }) - .mockRejectedValue({ message: 'File upload unsuccessful! Whatcha gonna do?' }) + mutate: jest + .fn() + .mockResolvedValueOnce({ + data: { UpdateUser: { id: 'upload1', avatar: '/upload/avatar.jpg' } } + }) + .mockRejectedValue({ + message: 'File upload unsuccessful! Whatcha gonna do?' + }) }, $toast: { success: jest.fn(), @@ -37,15 +41,14 @@ describe('Upload', () => { remove: jest.fn(), add: jest.fn() }, - querySelectorAll: jest.fn().mockReturnValue( - [ - { - alt: '', - style: { - 'background-image': '/api/generic.jpg' - } + querySelectorAll: jest.fn().mockReturnValue([ + { + alt: '', + style: { + 'background-image': '/api/generic.jpg' } - ]) + } + ]) } } diff --git a/webapp/pages/profile/_id/_slug.vue b/webapp/pages/profile/_id/_slug.vue index 6887eece2..387ada3cb 100644 --- a/webapp/pages/profile/_id/_slug.vue +++ b/webapp/pages/profile/_id/_slug.vue @@ -14,7 +14,17 @@ :class="{'disabled-content': user.disabled}" style="position: relative; height: auto;" > - + + - {{ link.username }} + {{ 'link.username' }} diff --git a/yarn.lock b/yarn.lock index e363d28ea..491979c13 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1815,6 +1815,11 @@ cypress-cucumber-preprocessor@^1.11.2: glob "^7.1.2" through "^2.3.8" +cypress-file-upload@^3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/cypress-file-upload/-/cypress-file-upload-3.1.2.tgz#4a0024f99ca157565bf2b20c110e6e6874da28cb" + integrity sha512-gZE2G7ZTD2Y8APrcgs+ATRMKs/IgH2rafCmi+8o99q5sDoNRLR+XKxOcoyWLehj9raGnO98YDYO8DY7k1VMGBw== + cypress-plugin-retries@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/cypress-plugin-retries/-/cypress-plugin-retries-1.2.1.tgz#0ae296e41c00c1aa1c2da83750e84c8a684e1c6b"