Skip to content

Move all of our helper files in test/ to a new directory test/helpers/ #3452

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 22, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ import { ProviderId } from '@firebase/auth-types-exp';
import { FirebaseError } from '@firebase/util';

import { Endpoint, HttpHeader } from '../';
import { mockEndpoint } from '../../../test/api/helper';
import { testAuth } from '../../../test/mock_auth';
import * as mockFetch from '../../../test/mock_fetch';
import { mockEndpoint } from '../../../test/helpers/api/helper';
import { testAuth } from '../../../test/helpers/mock_auth';
import * as mockFetch from '../../../test/helpers/mock_fetch';
import { Auth } from '../../model/auth';
import { ServerError } from '../errors';
import { deleteAccount, deleteLinkedAccounts, getAccountInfo } from './account';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ import * as chaiAsPromised from 'chai-as-promised';
import { FirebaseError } from '@firebase/util';

import { Endpoint, HttpHeader } from '../';
import { mockEndpoint } from '../../../test/api/helper';
import { testAuth } from '../../../test/mock_auth';
import * as mockFetch from '../../../test/mock_fetch';
import { mockEndpoint } from '../../../test/helpers/api/helper';
import { testAuth } from '../../../test/helpers/mock_auth';
import * as mockFetch from '../../../test/helpers/mock_fetch';
import { Auth } from '../../model/auth';
import { ServerError } from '../errors';
import {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ import * as chaiAsPromised from 'chai-as-promised';
import { FirebaseError } from '@firebase/util';

import { Endpoint, HttpHeader } from '../';
import { mockEndpoint } from '../../../test/api/helper';
import { testAuth } from '../../../test/mock_auth';
import * as mockFetch from '../../../test/mock_fetch';
import { mockEndpoint } from '../../../test/helpers/api/helper';
import { testAuth } from '../../../test/helpers/mock_auth';
import * as mockFetch from '../../../test/helpers/mock_fetch';
import { Auth } from '../../model/auth';
import { ServerError } from '../errors';
import {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ import * as chaiAsPromised from 'chai-as-promised';
import { FirebaseError } from '@firebase/util';

import { Endpoint, HttpHeader } from '../';
import { mockEndpoint } from '../../../test/api/helper';
import { testAuth } from '../../../test/mock_auth';
import * as mockFetch from '../../../test/mock_fetch';
import { mockEndpoint } from '../../../test/helpers/api/helper';
import { testAuth } from '../../../test/helpers/mock_auth';
import * as mockFetch from '../../../test/helpers/mock_fetch';
import { Auth } from '../../model/auth';
import { ServerError } from '../errors';
import { updateProfile } from './profile';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ import * as chaiAsPromised from 'chai-as-promised';
import { FirebaseError } from '@firebase/util';

import { Endpoint, HttpHeader } from '../';
import { mockEndpoint } from '../../../test/api/helper';
import { testAuth } from '../../../test/mock_auth';
import * as mockFetch from '../../../test/mock_fetch';
import { mockEndpoint } from '../../../test/helpers/api/helper';
import { testAuth } from '../../../test/helpers/mock_auth';
import * as mockFetch from '../../../test/helpers/mock_fetch';
import { Auth } from '../../model/auth';
import { ServerError } from '../errors';
import { createAuthUri } from './create_auth_uri';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ import { ProviderId } from '@firebase/auth-types-exp';
import { FirebaseError } from '@firebase/util';

import { Endpoint, HttpHeader } from '../';
import { mockEndpoint } from '../../../test/api/helper';
import { testAuth } from '../../../test/mock_auth';
import * as mockFetch from '../../../test/mock_fetch';
import { mockEndpoint } from '../../../test/helpers/api/helper';
import { testAuth } from '../../../test/helpers/mock_auth';
import * as mockFetch from '../../../test/helpers/mock_fetch';
import { Auth } from '../../model/auth';
import { ServerError } from '../errors';
import { signInWithCustomToken } from './custom_token';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,13 @@
import { expect, use } from 'chai';
import * as chaiAsPromised from 'chai-as-promised';

import { Operation } from '@firebase/auth-types-exp';
import { FirebaseError } from '@firebase/util';

import { Endpoint, HttpHeader } from '../';
import { mockEndpoint } from '../../../test/api/helper';
import { testAuth } from '../../../test/mock_auth';
import * as mockFetch from '../../../test/mock_fetch';
import { mockEndpoint } from '../../../test/helpers/api/helper';
import { testAuth } from '../../../test/helpers/mock_auth';
import * as mockFetch from '../../../test/helpers/mock_fetch';
import { Auth } from '../../model/auth';
import { ServerError } from '../errors';
import {
Expand All @@ -33,11 +34,10 @@ import {
sendPasswordResetEmail,
sendSignInLinkToEmail,
signInWithPassword,
VerifyEmailRequest,
verifyAndChangeEmail,
VerifyAndChangeEmailRequest
VerifyAndChangeEmailRequest,
VerifyEmailRequest
} from './email_and_password';
import { Operation } from '@firebase/auth-types-exp';

use(chaiAsPromised);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ import * as chaiAsPromised from 'chai-as-promised';
import { FirebaseError } from '@firebase/util';

import { Endpoint, HttpHeader } from '../';
import { mockEndpoint } from '../../../test/api/helper';
import { testAuth } from '../../../test/mock_auth';
import * as mockFetch from '../../../test/mock_fetch';
import { mockEndpoint } from '../../../test/helpers/api/helper';
import { testAuth } from '../../../test/helpers/mock_auth';
import * as mockFetch from '../../../test/helpers/mock_fetch';
import { Auth } from '../../model/auth';
import { ServerError } from '../errors';
import {
Expand Down
6 changes: 3 additions & 3 deletions packages-exp/auth-exp/src/api/authentication/idp.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ import * as chaiAsPromised from 'chai-as-promised';
import { FirebaseError } from '@firebase/util';

import { Endpoint, HttpHeader } from '../';
import { mockEndpoint } from '../../../test/api/helper';
import { testAuth } from '../../../test/mock_auth';
import * as mockFetch from '../../../test/mock_fetch';
import { mockEndpoint } from '../../../test/helpers/api/helper';
import { testAuth } from '../../../test/helpers/mock_auth';
import * as mockFetch from '../../../test/helpers/mock_fetch';
import { Auth } from '../../model/auth';
import { ServerError } from '../errors';
import { signInWithIdp } from './idp';
Expand Down
6 changes: 3 additions & 3 deletions packages-exp/auth-exp/src/api/authentication/mfa.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ import * as chaiAsPromised from 'chai-as-promised';
import { FirebaseError } from '@firebase/util';

import { Endpoint, HttpHeader } from '../';
import { mockEndpoint } from '../../../test/api/helper';
import { testAuth } from '../../../test/mock_auth';
import * as mockFetch from '../../../test/mock_fetch';
import { mockEndpoint } from '../../../test/helpers/api/helper';
import { testAuth } from '../../../test/helpers/mock_auth';
import * as mockFetch from '../../../test/helpers/mock_fetch';
import { Auth } from '../../model/auth';
import { ServerError } from '../errors';
import { finalizeSignInPhoneMfa, startSignInPhoneMfa } from './mfa';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ import * as chaiAsPromised from 'chai-as-promised';
import { FirebaseError } from '@firebase/util';

import { Endpoint, HttpHeader } from '../';
import { mockEndpoint } from '../../../test/api/helper';
import { testAuth } from '../../../test/mock_auth';
import * as mockFetch from '../../../test/mock_fetch';
import { mockEndpoint } from '../../../test/helpers/api/helper';
import { testAuth } from '../../../test/helpers/mock_auth';
import * as mockFetch from '../../../test/helpers/mock_fetch';
import { Auth } from '../../model/auth';
import { ServerError } from '../errors';
import { getRecaptchaParams } from './recaptcha';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ import * as chaiAsPromised from 'chai-as-promised';
import { FirebaseError } from '@firebase/util';

import { Endpoint, HttpHeader } from '../';
import { mockEndpoint } from '../../../test/api/helper';
import { testAuth } from '../../../test/mock_auth';
import * as mockFetch from '../../../test/mock_fetch';
import { mockEndpoint } from '../../../test/helpers/api/helper';
import { testAuth } from '../../../test/helpers/mock_auth';
import * as mockFetch from '../../../test/helpers/mock_fetch';
import { Auth } from '../../model/auth';
import { ServerError } from '../errors';
import { signUp } from './sign_up';
Expand Down
6 changes: 3 additions & 3 deletions packages-exp/auth-exp/src/api/authentication/sms.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ import { ProviderId } from '@firebase/auth-types-exp';
import { FirebaseError } from '@firebase/util';

import { Endpoint, HttpHeader } from '../';
import { mockEndpoint } from '../../../test/api/helper';
import { testAuth } from '../../../test/mock_auth';
import * as mockFetch from '../../../test/mock_fetch';
import { mockEndpoint } from '../../../test/helpers/api/helper';
import { testAuth } from '../../../test/helpers/mock_auth';
import * as mockFetch from '../../../test/helpers/mock_fetch';
import { Auth } from '../../model/auth';
import { ServerError } from '../errors';
import {
Expand Down
6 changes: 3 additions & 3 deletions packages-exp/auth-exp/src/api/authentication/token.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ import * as chaiAsPromised from 'chai-as-promised';

import { FirebaseError, querystringDecode } from '@firebase/util';

import { testAuth } from '../../../test/mock_auth';
import * as fetch from '../../../test/mock_fetch';
import { HttpHeader } from '../';
import { testAuth } from '../../../test/helpers/mock_auth';
import * as fetch from '../../../test/helpers/mock_fetch';
import { Auth } from '../../model/auth';
import { ServerError } from '../errors';
import { _ENDPOINT, requestStsToken } from './token';
import { HttpHeader } from '..';

use(chaiAsPromised);

Expand Down
10 changes: 5 additions & 5 deletions packages-exp/auth-exp/src/api/index.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,17 @@ import { SinonStub, stub, useFakeTimers } from 'sinon';

import { FirebaseError } from '@firebase/util';

import { mockEndpoint } from '../../test/api/helper';
import { testAuth } from '../../test/mock_auth';
import * as mockFetch from '../../test/mock_fetch';
import { mockEndpoint } from '../../test/helpers/api/helper';
import { testAuth } from '../../test/helpers/mock_auth';
import * as mockFetch from '../../test/helpers/mock_fetch';
import { AuthErrorCode } from '../core/errors';
import { Auth } from '../model/auth';
import {
_performApiRequest,
DEFAULT_API_TIMEOUT_MS,
Endpoint,
HttpMethod,
HttpHeader
HttpHeader,
HttpMethod
} from './';
import { ServerError } from './errors';

Expand Down
2 changes: 1 addition & 1 deletion packages-exp/auth-exp/src/core/action_code_url.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import { expect } from 'chai';

import { Operation } from '@firebase/auth-types-exp';

import { testAuth } from '../../test/mock_auth';
import { testAuth } from '../../test/helpers/mock_auth';
import { Auth } from '../model/auth';
import { ActionCodeURL } from './action_code_url';

Expand Down
2 changes: 1 addition & 1 deletion packages-exp/auth-exp/src/core/auth/auth_impl.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import { FirebaseApp } from '@firebase/app-types-exp';
import * as externs from '@firebase/auth-types-exp';
import { FirebaseError } from '@firebase/util';

import { testUser } from '../../../test/mock_auth';
import { testUser } from '../../../test/helpers/mock_auth';
import { Auth } from '../../model/auth';
import { User } from '../../model/user';
import { browserPopupRedirectResolver } from '../../platform_browser/popup_redirect';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ import * as chaiAsPromised from 'chai-as-promised';

import { ProviderId, SignInMethod } from '@firebase/auth-types-exp';

import { mockEndpoint } from '../../../test/api/helper';
import { testAuth } from '../../../test/mock_auth';
import * as mockFetch from '../../../test/mock_fetch';
import { mockEndpoint } from '../../../test/helpers/api/helper';
import { testAuth } from '../../../test/helpers/mock_auth';
import * as mockFetch from '../../../test/helpers/mock_fetch';
import { Endpoint } from '../../api';
import { APIUserInfo } from '../../api/account_management/account';
import { Auth } from '../../model/auth';
Expand Down
6 changes: 3 additions & 3 deletions packages-exp/auth-exp/src/core/credentials/email.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ import * as chaiAsPromised from 'chai-as-promised';

import { ProviderId, SignInMethod } from '@firebase/auth-types-exp';

import { mockEndpoint } from '../../../test/api/helper';
import { testAuth } from '../../../test/mock_auth';
import * as mockFetch from '../../../test/mock_fetch';
import { mockEndpoint } from '../../../test/helpers/api/helper';
import { testAuth } from '../../../test/helpers/mock_auth';
import * as mockFetch from '../../../test/helpers/mock_fetch';
import { Endpoint } from '../../api';
import { APIUserInfo } from '../../api/account_management/account';
import { Auth } from '../../model/auth';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import { expect } from 'chai';

import { ProviderId } from '@firebase/auth-types-exp';

import { TEST_ID_TOKEN_RESPONSE } from '../../../test/id_token_response';
import { TEST_ID_TOKEN_RESPONSE } from '../../../test/helpers/id_token_response';
import { _authCredentialFromTokenResponse } from './from_token_response';

describe('src/core/credentials/inferred', () => {
Expand Down
6 changes: 3 additions & 3 deletions packages-exp/auth-exp/src/core/credentials/phone.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@

import { expect } from 'chai';

import { mockEndpoint } from '../../../test/api/helper';
import { testAuth } from '../../../test/mock_auth';
import * as fetch from '../../../test/mock_fetch';
import { mockEndpoint } from '../../../test/helpers/api/helper';
import { testAuth } from '../../../test/helpers/mock_auth';
import * as fetch from '../../../test/helpers/mock_fetch';
import { Endpoint } from '../../api';
import { Auth } from '../../model/auth';
import { IdTokenResponse, IdTokenResponseKind } from '../../model/id_token';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import { expect } from 'chai';
import * as sinon from 'sinon';

import { testUser } from '../../../test/mock_auth';
import { testUser } from '../../../test/helpers/mock_auth';
import { _getInstance } from '../util/instantiator';
import { PersistedBlob, Persistence, PersistenceType } from './';
import { browserLocalPersistence, browserSessionPersistence } from './browser';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

import { expect } from 'chai';

import { testUser } from '../../../test/mock_auth';
import { testUser } from '../../../test/helpers/mock_auth';
import { _getInstance } from '../util/instantiator';
import { Persistence, PersistenceType } from './';
import { inMemoryPersistence } from './in_memory';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import { expect } from 'chai';
import * as sinon from 'sinon';

import { testUser } from '../../../test/mock_auth';
import { testUser } from '../../../test/helpers/mock_auth';
import { _getInstance } from '../util/instantiator';
import { Persistence, PersistenceType } from './';
import { indexedDBLocalPersistence } from './indexed_db';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import { expect } from 'chai';
import * as sinon from 'sinon';
import * as sinonChai from 'sinon-chai';

import { testAuth, testUser } from '../../../test/mock_auth';
import { testAuth, testUser } from '../../../test/helpers/mock_auth';
import { Auth } from '../../model/auth';
import { UserImpl } from '../user/user_impl';
import { _getInstance } from '../util/instantiator';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import { expect } from 'chai';

import { ReactNativeAsyncStorage } from '@firebase/auth-types-exp';

import { testUser } from '../../../test/mock_auth';
import { testUser } from '../../../test/helpers/mock_auth';
import { _getInstance } from '../util/instantiator';
import { PersistedBlob, Persistence, PersistenceType } from './';
import { getReactNativePersistence } from './react_native';
Expand Down
8 changes: 5 additions & 3 deletions packages-exp/auth-exp/src/core/providers/email.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,14 @@
* limitations under the License.
*/

import { expect, use } from 'chai';
import * as chaiAsPromised from 'chai-as-promised';

import { ProviderId, SignInMethod } from '@firebase/auth-types-exp';
// eslint-disable-next-line import/no-extraneous-dependencies
import { FirebaseError } from '@firebase/util';
import { expect, use } from 'chai';
import * as chaiAsPromised from 'chai-as-promised';
import { testAuth } from '../../../test/mock_auth';

import { testAuth } from '../../../test/helpers/mock_auth';
import { Auth } from '../../model/auth';
import { EmailAuthProvider } from './email';

Expand Down
6 changes: 3 additions & 3 deletions packages-exp/auth-exp/src/core/providers/phone.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
import { expect } from 'chai';
import * as sinon from 'sinon';

import { mockEndpoint } from '../../../test/api/helper';
import { testAuth } from '../../../test/mock_auth';
import * as fetch from '../../../test/mock_fetch';
import { mockEndpoint } from '../../../test/helpers/api/helper';
import { testAuth } from '../../../test/helpers/mock_auth';
import * as fetch from '../../../test/helpers/mock_fetch';
import { Endpoint } from '../../api';
import { Auth } from '../../model/auth';
import { RecaptchaVerifier } from '../../platform_browser/recaptcha/recaptcha_verifier';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ import * as sinonChai from 'sinon-chai';
import { OperationType } from '@firebase/auth-types-exp';
import { FirebaseError } from '@firebase/util';

import { delay } from '../../../test/delay';
import { authEvent, BASE_AUTH_EVENT } from '../../../test/iframe_event';
import { testAuth, testUser } from '../../../test/mock_auth';
import { makeMockPopupRedirectResolver } from '../../../test/mock_popup_redirect_resolver';
import { delay } from '../../../test/helpers/delay';
import { authEvent, BASE_AUTH_EVENT } from '../../../test/helpers/iframe_event';
import { testAuth, testUser } from '../../../test/helpers/mock_auth';
import { makeMockPopupRedirectResolver } from '../../../test/helpers/mock_popup_redirect_resolver';
import { Auth } from '../../model/auth';
import {
AuthEvent,
Expand Down
Loading