[test/functional/page_objects] tsfy shield & error

elastic · Apr 30, 2020 · 1c38379 · 1c38379
1 parent 9b54d71
commit 1c38379
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/test/functional/page_objects/error_page.js → test/functional/page_objects/error_page.ts b/test/functional/page_objects/error_page.js → test/functional/page_objects/error_page.ts
@@ -16,14 +16,16 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import expect from '@kbn/expect';
 
-export function ErrorPageProvider({ getPageObjects }) {
-  const PageObjects = getPageObjects(['common']);
+import expect from '@kbn/expect/expect.js';
+import { FtrProviderContext } from '../ftr_provider_context';
+
+export function ErrorPageProvider({ getPageObjects }: FtrProviderContext) {
+  const { common } = getPageObjects(['common']);
 
   class ErrorPage {
-    async expectForbidden() {
-      const messageText = await PageObjects.common.getBodyText();
+    public async expectForbidden() {
+      const messageText = await common.getBodyText();
       expect(messageText).to.eql(
         JSON.stringify({
           statusCode: 403,
@@ -32,8 +34,9 @@ export function ErrorPageProvider({ getPageObjects }) {
         })
       );
     }
-    async expectNotFound() {
-      const messageText = await PageObjects.common.getBodyText();
+
+    public async expectNotFound() {
+      const messageText = await common.getBodyText();
       expect(messageText).to.eql(
         JSON.stringify({
           statusCode: 404,

diff --git a/test/functional/page_objects/index.ts b/test/functional/page_objects/index.ts
@@ -22,7 +22,6 @@ import { ConsolePageProvider } from './console_page';
 import { ContextPageProvider } from './context_page';
 import { DashboardPageProvider } from './dashboard_page';
 import { DiscoverPageProvider } from './discover_page';
-// @ts-ignore not TS yet
 import { ErrorPageProvider } from './error_page';
 import { HeaderPageProvider } from './header_page';
 import { HomePageProvider } from './home_page';
@@ -33,7 +32,6 @@ import { NewsfeedPageProvider } from './newsfeed_page';
 import { PointSeriesPageProvider } from './point_series_page';
 import { SettingsPageProvider } from './settings_page';
 import { SharePageProvider } from './share_page';
-// @ts-ignore not TS yet
 import { ShieldPageProvider } from './shield_page';
 import { TimePickerProvider } from './time_picker';
 import { TimelionPageProvider } from './timelion_page';

diff --git a/test/functional/page_objects/shield_page.js → test/functional/page_objects/shield_page.ts b/test/functional/page_objects/shield_page.js → test/functional/page_objects/shield_page.ts
@@ -17,11 +17,13 @@
  * under the License.
  */
 
-export function ShieldPageProvider({ getService }) {
+import { FtrProviderContext } from '../ftr_provider_context';
+
+export function ShieldPageProvider({ getService }: FtrProviderContext) {
   const testSubjects = getService('testSubjects');
 
   class ShieldPage {
-    async login(user, pwd) {
+    async login(user: string, pwd: string) {
       await testSubjects.setValue('loginUsername', user);
       await testSubjects.setValue('loginPassword', pwd);
       await testSubjects.click('loginSubmit');