Skip to content

Move tests to specific folders based on area #399

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.

Sign up for GitHub

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
Jun 15, 2020
Merged

Move tests to specific folders based on area #399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
13ae5d5
Move tests to specific folders based on area
patrick-tolosa Jun 4, 2020
c427838
Reset config before starting tests
patrick-tolosa Jun 15, 2020
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
8 changes: 4 additions & 4 deletions test/api_spec.js → test/integration/api/admin/api_spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ const sinon = require('sinon');
const ClientRequest = require('_http_client').ClientRequest;
const http = require('http');
const Q = require('q');
const cloudinary = require("../cloudinary");
const helper = require("./spechelper");
const wait = require('./testUtils/helpers/wait');
const cloudinary = require("../../../../cloudinary");
const helper = require("../../../spechelper");
const wait = require('../../../testUtils/helpers/wait');
const sharedExamples = helper.sharedExamples;
const itBehavesLike = helper.itBehavesLike;
const uploadImage = helper.uploadImage;

const testConstants = require('./testUtils/testConstants');
const testConstants = require('../../../testUtils/testConstants');
const API_V2 = cloudinary.v2.api;

const {
Expand Down
6 changes: 3 additions & 3 deletions test/search_spec.js → test/integration/api/search/search_spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ require('dotenv').load({

const expect = require('expect.js');
const Q = require('q');
const cloudinary = require('../cloudinary');
const helper = require("./spechelper");
const cloudinary = require('../../../../cloudinary');
const helper = require("../../../spechelper");



const testConstants = require('./testUtils/testConstants');
const testConstants = require('../../../testUtils/testConstants');

const {
TIMEOUT,
Expand Down
8 changes: 4 additions & 4 deletions test/uploader_spec.js → ...integration/api/uploader/uploader_spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ const path = require('path');
const at = require('lodash/at');
const uniq = require('lodash/uniq');
const ClientRequest = require('_http_client').ClientRequest;
const cloudinary = require("../cloudinary");
const helper = require("./spechelper");
const cloudinary = require("../../../../cloudinary");
const helper = require("../../../spechelper");

const IMAGE_FILE = helper.IMAGE_FILE;
const LARGE_RAW_FILE = helper.LARGE_RAW_FILE;
Expand All @@ -27,9 +27,9 @@ const METADATA_FIELD_UNIQUE_EXTERNAL_ID = 'metadata_field_external_id_' + TEST_I
const METADATA_FIELD_VALUE = 'metadata_field_value_' + TEST_ID;
const METADATA_SAMPLE_DATA = { metadata_color: "red", metadata_shape: "dodecahedron" };
const METADATA_SAMPLE_DATA_ENCODED = "metadata_color=red|metadata_shape=dodecahedron";
const createTestConfig = require('./testUtils/createTestConfig');
const createTestConfig = require('../../../testUtils/createTestConfig');

const testConstants = require('./testUtils/testConstants');
const testConstants = require('../../../testUtils/testConstants');
const UPLOADER_V2 = cloudinary.v2.uploader;

const {
Expand Down
4 changes: 3 additions & 1 deletion test/utils/image_versionID_spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,13 @@ const expect = require("expect.js");
const mock = require('mock-fs');
const getSDKVersionID = require('../../lib/utils/encoding/sdkVersionID/getSDKVersionID');
const cloudinary = require('../../cloudinary');
const TEST_CLOUD_NAME = require('../testUtils/testConstants').TEST_CLOUD_NAME
const TEST_CLOUD_NAME = require('../testUtils/testConstants').TEST_CLOUD_NAME;

describe('Tests for sdk versionID through image tag', function () {
let processVersions = {};
beforeEach(() => {
cloudinary.config(true); // reset

processVersions = process.versions;
delete process.versions;

Expand Down
14 changes: 7 additions & 7 deletions test/utils_spec.js → test/utils/utils_spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,19 @@ const expect = require("expect.js");
const fs = require('fs');
const os = require('os');
const defaults = require('lodash/defaults');
const cloudinary = require("../cloudinary");
const helper = require("./spechelper");
const TIMEOUT = require('./testUtils/testConstants').TIMEOUT;
const wait = require('./testUtils/helpers/wait');
const generateBreakpoints = require(`../${helper.libPath}/utils/generateBreakpoints`);
const { srcsetUrl, generateSrcsetAttribute } = require(`../${helper.libPath}/utils/srcsetUtils`);
const cloudinary = require("../../cloudinary");
const helper = require("../spechelper");
const TIMEOUT = require('../testUtils/testConstants').TIMEOUT;
const wait = require('../testUtils/helpers/wait');
const generateBreakpoints = require(`../../${helper.libPath}/utils/generateBreakpoints`);
const { srcsetUrl, generateSrcsetAttribute } = require(`../../${helper.libPath}/utils/srcsetUtils`);

const utils = cloudinary.utils;
const { clone, isString, merge, pickOnlyExistingValues } = utils;
const { sharedExamples, itBehavesLike, test_cloudinary_url } = helper;

const TEST_TAG = helper.TEST_TAG;
const createTestConfig = require('./testUtils/createTestConfig');
const createTestConfig = require('../testUtils/createTestConfig');
// Defined globals
var cloud_name = '';

Expand Down