Merge branch 'master' into stepper_style

# Conflicts:
#	src/components/LicenseText.vue
#	src/locales/en.json
#	tests/e2e/specs/AttributionDetailsStep.js
#	tests/e2e/specs/CopyrightWaiverStep.js
#	tests/e2e/specs/LicenseDetailsCard.js
#	tests/e2e/specs/Stepper.js
#	tests/unit/specs/components/ChooserStep.spec.js
#	tests/unit/specs/components/CopyrightWaiverStep.spec.js

src/components/LicenseText.vue

@@ -75,7 +75,10 @@ export default {
             return this.shortName === 'CC0 1.0' ? 'license-use.richtext.marked-text' : 'license-use.richtext.licensed-text'
         },
         isCreatorLink() {
-            return this.attributionDetails.creatorName && this.creatorProfileUrl && this.isWeb
+            return this.creatorName && this.creatorProfileUrl && this.isWeb
+        },
+        licenseName() {
+            return this.attributionType === 'short' ? this.shortName : this.fullName
         },
         byString() {
             return this.creatorName ? this.$t('license-use.richtext.by') : ''

src/locales/en.json

@@ -120,7 +120,7 @@
         "copy-label": "Copy",
         "copied-label": "Copied!",
         "richtext": {
-            "full-text": "{workTitle} {by} {creator} {licenseMark} {license}",
+            "full-text": "{workTitle} {by} {creator}{licenseMark} {license}{print-instructions}",
             "workTitle": "This work",
             "by": "by",
             "licensed-text": "is licensed under",

tests/unit/specs/components/CopyrightWaiverStep.spec.js

@@ -71,16 +71,9 @@ describe('Test the functionality of Computed properties', () => {
         wrapper.destroy()
     })
 
-    // it('User checks confirmed then checks agreed', () => {
-    //     const checkbox1 = wrapper.findAll('input[type="checkbox"]').at(1)
-    //     checkbox1.setChecked()
-    //
-    //     const checkbox = wrapper.findAll('input[type="checkbox"]').at(0)
-    //     checkbox.setChecked()
-    //
-    //     expect(wrapper.emitted().change[0]).toStrictEqual(['CW', 6, true])
-    //     expect(wrapper.vm.copyrightWaiverAgreed).toBe(true)
-    // })
+    it('User checks confirmed then checks agreed', () => {
+        const checkbox1 = wrapper.findAll('input[type="checkbox"]').at(1)
+        checkbox1.setChecked()
 
         const checkbox = wrapper.findAll('input[type="checkbox"]').at(0)
         checkbox.setChecked()