Merge pull request #1 from creativecommons/main

bump

Author: Cronus1007

.eslintrc.js

@@ -1,6 +1,8 @@
 module.exports = {
   root: true,
 
+  plugins: ['cypress'],
+
   env: {
     node: true,
     browser: true,
@@ -39,5 +41,6 @@ module.exports = {
     '@vue/standard',
     'prettier',
     'prettier/vue',
+    "plugin:cypress/recommended"
   ],
 }

jsconfig.json

@@ -0,0 +1,3 @@
+{
+  "types": ["cypress"]
+}

package-lock.json

@@ -48,6 +48,7 @@
         "cypress": "^6.3.0",
         "eslint": "^6.8.0",
         "eslint-config-prettier": "^7.2.0",
+        "eslint-plugin-cypress": "^2.11.2",
         "eslint-plugin-import": "^2.22.0",
         "eslint-plugin-node": "^11.1.0",
         "eslint-plugin-prettier": "^3.3.1",

package.json

@@ -1,3 +1,9 @@
+// type definitions for Cypress object "cy"
+/// <reference types="cypress" />
+
+// type definitions for custom commands like "createDefaultTodos"
+/// <reference types="../support/commands.js" />
+
 /* This Source Code Form is subject to the terms of the Creative Commons
  * License Chooser
 */
@@ -47,9 +53,14 @@ describe('Attribution Details Step.vue', () => {
       cy.visit('/')
       cy.makeAChoice('.FS', 'no')
       cy.clickNext()
+
+      // Appropriate license step
+      cy.get('.AL [type="checkbox"]').each($el => cy.wrap($el).check())
+      cy.clickNext()
+
       cy.makeAChoice('.BY', 'yes')
       cy.hasRecommendedLicense('CC BY 4.0')
-      cy.hasStepsCount(6)
+      cy.hasStepsCount(7)
       cy.clickNext()
       cy.makeAChoice('.NC', 'yes')
       cy.clickNext()
@@ -68,6 +79,7 @@ describe('Attribution Details Step.vue', () => {
       cy.visit('/')
       cy.makeAChoice('.FS', 'yes')
       cy.clickNext()
+
       cy.get('select').select('CC0 1.0')
       cy.hasRecommendedLicense('CC0 1.0 Universal')
       cy.hasStepsCount(4)

tests/cypress/integration/AttributionDetails._spec.js

@@ -34,9 +34,15 @@ describe('Stepper.vue', () => {
       cy.visit('/')
       cy.makeAChoice('.FS', 'no')
       cy.clickNext()
+
+      // Appropriate license step
+      cy.get('.AL [type="checkbox"]').each($el => cy.wrap($el).check())
+      cy.clickNext()
+
+
       cy.makeAChoice('.BY', 'no')
       cy.hasRecommendedLicense('CC0 1.0 Universal')
-      cy.hasStepsCount(7)
+      cy.hasStepsCount(8)
       cy.clickNext()
       cy.get('.NC').should('have.class', 'disabled')
       cy.get('.ND').should('have.class', 'disabled')
@@ -50,9 +56,14 @@ describe('Stepper.vue', () => {
       cy.visit('/')
       cy.makeAChoice('.FS', 'no')
       cy.clickNext()
+
+      // Appropriate license step
+      cy.get('.AL [type="checkbox"]').each($el => cy.wrap($el).check())
+      cy.clickNext()
+
       cy.makeAChoice('.BY', 'yes')
       cy.hasRecommendedLicense('CC BY 4.0')
-      cy.hasStepsCount(6)
+      cy.hasStepsCount(7)
       cy.clickNext()
       cy.makeAChoice('.NC', 'yes')
       cy.clickNext()
@@ -68,6 +79,11 @@ describe('Stepper.vue', () => {
       cy.visit('/')
       cy.makeAChoice('.FS', 'no')
       cy.clickNext()
+
+      // Appropriate license step
+      cy.get('.AL [type="checkbox"]').each($el => cy.wrap($el).check())
+      cy.clickNext()
+
       cy.makeAChoice('.BY', 'yes')
       cy.hasRecommendedLicense('CC BY 4.0')
       cy.clickNext()
@@ -85,6 +101,11 @@ describe('Stepper.vue', () => {
       cy.visit('/')
       cy.makeAChoice('.FS', 'no')
       cy.clickNext()
+
+      // Appropriate license step
+      cy.get('.AL [type="checkbox"]').each($el => cy.wrap($el).check())
+      cy.clickNext()
+
       cy.makeAChoice('.BY', 'yes')
       cy.hasRecommendedLicense('CC BY 4.0')
       cy.clickNext()
@@ -103,6 +124,7 @@ describe('Stepper.vue', () => {
       cy.clickBack()
       cy.makeAChoice('.ND', 'yes')
       cy.clickNext()
+      cy.makeAChoice('.SA', 'yes') // @todo Fix this bug, must click yes before no to get it to switch
       cy.makeAChoice('.SA', 'no')
       cy.clickNext()
       cy.hasRecommendedLicense('CC BY-SA 4.0')
@@ -125,6 +147,12 @@ describe('Stepper.vue', () => {
       cy.clickBack()
       cy.makeAChoice('.FS', 'no')
       cy.clickNext()
+
+      // Appropriate license step
+      cy.get('.AL [type="checkbox"]').each($el => cy.wrap($el).check())
+      cy.clickNext()
+
+
       cy.makeAChoice('.BY', 'yes')
       cy.hasRecommendedLicense('CC BY 4.0')
       cy.clickNext()
@@ -153,6 +181,12 @@ describe('Stepper.vue', () => {
       cy.viewport('iphone-x')
       cy.makeAChoice('.FS', 'no')
       cy.clickNext()
+
+      // Appropriate license step
+      cy.get('.AL [type="checkbox"]').each($el => cy.wrap($el).check())
+      cy.clickNext()
+
+
       cy.makeAChoice('.BY', 'yes')
       cy.clickNext()
       cy.makeAChoice('.NC', 'yes')
@@ -162,12 +196,12 @@ describe('Stepper.vue', () => {
       cy.get('.SA').should('have.class', 'disabled')
       cy.hasRecommendedLicense('CC BY-ND 4.0')
       cy.window().then(($window) => {
-        expect($window.scrollY).to.be.closeTo(800, 300)
+        expect($window.scrollY).to.be.closeTo(800, 500)
       })
       cy.get('button').contains('DONE').click()
       cy.hasLicenseInAttributionCode('CC BY-ND 4.0')
       cy.window().then(($window) => {
-        expect($window.scrollY).to.be.closeTo(1400, 300)
+        expect($window.scrollY).to.be.closeTo(1400, 500)
       })
     })
   })