From 0d9071109f1be68617f27ea983fb484d393f2078 Mon Sep 17 00:00:00 2001 From: Aleksander Nowodzinski Date: Fri, 5 May 2017 15:13:12 +0200 Subject: [PATCH 1/2] Feature: URL input field should provide a placeholder. Closes #109. --- src/ui/linkformview.js | 1 + tests/ui/linkformview.js | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/ui/linkformview.js b/src/ui/linkformview.js index 9db9ae3..3ad5a82 100644 --- a/src/ui/linkformview.js +++ b/src/ui/linkformview.js @@ -199,6 +199,7 @@ export default class LinkFormView extends View { const labeledInput = new LabeledInputView( this.locale, InputTextView ); labeledInput.label = t( 'Link URL' ); + labeledInput.inputView.placeholder = t( 'http://example.com' ); return labeledInput; } diff --git a/tests/ui/linkformview.js b/tests/ui/linkformview.js index f9c6f75..3fbbf86 100644 --- a/tests/ui/linkformview.js +++ b/tests/ui/linkformview.js @@ -18,7 +18,7 @@ describe( 'LinkFormView', () => { let view; beforeEach( () => { - view = new LinkFormView( { t: () => {} } ); + view = new LinkFormView( { t: () => 'http://example.com' } ); return view.init(); } ); @@ -97,6 +97,12 @@ describe( 'LinkFormView', () => { expect( spy.calledOnce ).to.true; } ); + describe( 'url input view', () => { + it( 'has placeholder', () => { + expect( view.urlInputView.inputView.placeholder ).to.equal( 'http://example.com' ); + } ); + } ); + describe( 'template', () => { it( 'has url input view', () => { expect( view.template.children.get( 0 ) ).to.equal( view.urlInputView ); From 31ac147f9d21fb8058135f034edb4d8838bc5c8e Mon Sep 17 00:00:00 2001 From: Aleksander Nowodzinski Date: Thu, 11 May 2017 15:00:11 +0200 Subject: [PATCH 2/2] Tests: Code refactoring in link tests. --- tests/ui/linkformview.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/ui/linkformview.js b/tests/ui/linkformview.js index 3fbbf86..b9bda07 100644 --- a/tests/ui/linkformview.js +++ b/tests/ui/linkformview.js @@ -18,7 +18,7 @@ describe( 'LinkFormView', () => { let view; beforeEach( () => { - view = new LinkFormView( { t: () => 'http://example.com' } ); + view = new LinkFormView( { t: ( val ) => val } ); return view.init(); } );