[DRAFT] Additional Tests for the Preprints index page

app/preprints/-components/branded-footer/component.ts

@@ -8,6 +8,6 @@ export default class BrandedFooter extends Component<InputArgs> {
     footerLinks = this.args.footerLinks;
 
     get hasFooters(): boolean {
-        return this.footerLinks !== '';
+        return this.footerLinks !== '' && this.footerLinks !== undefined;
     }
 }

app/preprints/-components/branded-footer/template.hbs

@@ -1,5 +1,5 @@
 {{#if this.hasFooters}}
-    <div local-class='branded-footer-links'>
+    <div local-class='branded-footer-links' data-test-footer-links>
         {{html-safe this.footerLinks}}
     </div>
 {{/if}}

lib/osf-components/addon/components/branded-header/component.ts

@@ -4,7 +4,6 @@ import { inject as service } from '@ember/service';
 import Intl from 'ember-intl/services/intl';
 import Media from 'ember-responsive';
 
-import ProviderModel from 'ember-osf-web/models/provider';
 import Analytics from 'ember-osf-web/services/analytics';
 import { tracked } from '@glimmer/tracking';
 import { requiredAction } from 'ember-osf-web/decorators/component';
@@ -23,7 +22,6 @@ export default class BrandedHeader extends Component<InputArgs> {
     @requiredAction onSearch!: (value: string) => void;
     @tracked showingHelp = false;
 
-    providerModel?: ProviderModel;
     notBranded = true;
     localClassNameBindings = ['notBranded:Header'];
     today = new Date();
@@ -43,20 +41,14 @@ export default class BrandedHeader extends Component<InputArgs> {
             : this.intl.t(`${this.args.translationParent}.header.search_placeholder`);
     }
 
-    @computed('providerModel.name', 'args.translationParent')
+    @computed('args.translationParent')
     get headerAriaLabel() {
-        return this.providerModel ?
-            this.providerModel.name.concat(' ', this.intl.t(`${this.args.translationParent}.header.registrations`))
-            : this.intl.t(`${this.args.translationParent}.header.osf_registrations`);
+        return  this.intl.t(`${this.args.translationParent}.header.osf_registrations`);
     }
 
     @action
     onSubmit() {
-        if (this.providerModel) {
-            this.analytics.click('link', `Discover - Search ${this.providerModel.name}`, this.value);
-        } else {
-            this.analytics.click('link', 'Discover - Search', this.value);
-        }
+        this.analytics.click('link', 'Discover - Search', this.value);
         this.args.onSearch(this.value);
     }
 
@@ -68,11 +60,7 @@ export default class BrandedHeader extends Component<InputArgs> {
     @action
     keyPress(event: KeyboardEvent) {
         if (event.keyCode !== 13) {
-            if (this.providerModel) {
-                this.analytics.track('input', 'onkeyup', `Discover - Search ${this.providerModel.name}`, this.value);
-            } else {
-                this.analytics.track('input', 'onkeyup', 'Discover - Search', this.value);
-            }
+            this.analytics.track('input', 'onkeyup', 'Discover - Search', this.value);
         }
     }
 }

lib/osf-components/addon/components/branded-header/template.hbs

@@ -49,11 +49,6 @@
             {{/if}}
         </form>
     </div>
-    {{#if @providerModel.htmlSafeDescription}}
-        <div  local-class='provider-description' data-test-provider-description>
-            {{@providerModel.htmlSafeDescription}}
-        </div>
-    {{/if}}
 
     <div local-class='example-container'>
         {{yield (hash row=(element ''))}}

tests/acceptance/preprints/branded-footer-test.ts

@@ -0,0 +1,45 @@
+import { render } from '@ember/test-helpers';
+import { hbs } from 'ember-cli-htmlbars';
+import { setupRenderingTest } from 'ember-qunit';
+import { module, test } from 'qunit';
+
+module('Acceptance | preprints | branded-footer', hooks => {
+    setupRenderingTest(hooks);
+
+    test('it inserts the footerLink when present', async function(assert) {
+        // Given no list is provided
+        // When the component is rendered
+        await render(hbs`
+            <Preprints::-components::BrandedFooter
+                @footerLinks='these are the footer links'
+            >
+            </Preprints::-components::BrandedFooter>
+        `);
+
+        // Then the footer links are verified
+        assert.dom('[data-test-footer-links]').hasText('these are the footer links', 'The footer links are present');
+    });
+
+    test('it does not insert the footerLink when undefined', async function(assert) {
+        // Given no list is provided
+        // When the component is rendered
+        await render(hbs`<Preprints::-components::BrandedFooter/>`);
+
+        // Then the footer links are verified
+        assert.dom('[data-test-footer-links]').doesNotExist('The footer links are not present');
+    });
+
+    test('it does no insert the footerLink when it an empty string', async function(assert) {
+        // Given no list is provided
+        // When the component is rendered
+        await render(hbs`
+            <Preprints::-components::BrandedFooter
+                @footerLinks=''
+            >
+            </Preprints::-components::BrandedFooter>
+        `);
+
+        // Then the footer links are verified
+        assert.dom('[data-test-footer-links]').doesNotExist('The footer links are not present');
+    });
+});

tests/integration/components/branded-header/component-test.ts

@@ -26,28 +26,51 @@ module('Integration | Component | branded-header', hooks => {
                 @showHelp=true
                 @searchPlaceholder={{this.searchPlaceholder}}
                 as |branded-header|
-            ></BrandedHeader>
+            >
+                {{#branded-header.lead}}
+                    <div data-test-lead-yield>
+                        This is the lead
+                    </div>
+                {{/branded-header.lead}}
+                {{#branded-header.row}}
+                    <div data-test-row-yield>
+                        This is the row 
+                    </div>
+                {{/branded-header.row}} 
+            </BrandedHeader>
         `);
 
         // Then the header container is verified
         const headerContainer = this.element.querySelector('[data-test-header-container]');
         assert.dom(headerContainer).exists();
 
-        // Then the header container is verified
+        // And the brand logo container is verified
         assert.dom(this.element.querySelector('[data-test-brand-logo]')).hasAttribute('aria-label', 'OSF Preprints');
 
+        // And the perform search button is verified
         // eslint-disable-next-line max-len
         assert.dom(this.element.querySelector('[data-test-perform-search-button]')).hasAttribute('aria-label', 'Perform search');
         assert.dom(this.element.querySelector('[data-test-perform-search-button]')).hasAttribute('type', 'button');
 
+        // And the search icon is verified
         // eslint-disable-next-line max-len
         assert.dom(this.element.querySelector('[data-test-search-icon]')).hasAttribute('data-icon', 'search');
 
+        // And the search box is verified
         // eslint-disable-next-line max-len
         assert.dom(this.element.querySelector('[data-test-search-box]')).hasAttribute('placeholder', 'preprints.header.search_placeholder');
 
+        // And the search help button is verified
         // eslint-disable-next-line max-len
         assert.dom(this.element.querySelector('[data-test-search-help-button]')).hasAttribute('aria-label', 'Search help');
         assert.dom(this.element.querySelector('[data-test-search-help-button]')).hasAttribute('type', 'button');
+
+        // And the lead yield is verified
+        // eslint-disable-next-line max-len
+        assert.dom(this.element.querySelector('[data-test-lead-yield]')).hasText('This is the lead', 'The lead in yielded correctly');
+
+        // And the row yield is verified
+        // eslint-disable-next-line max-len
+        assert.dom(this.element.querySelector('[data-test-row-yield]')).hasText('This is the row', 'The lead in yielded correctly');
     });
 });