Skip to content

Commit 9adf49a

Browse files
committed
Fix conflicts
2 parents ff95d2c + 9a2bf8a commit 9adf49a

54 files changed

Lines changed: 4370 additions & 43 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

LICENSE

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
MIT License
2+
3+
Copyright (c) 2019 CloudLibz
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

client/enzyme.config.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
/** Used in jest.config.js */
2+
import { configure } from "enzyme";
3+
import Adapter from "enzyme-adapter-react-16";
4+
5+
configure({ adapter: new Adapter() });

client/jest.config.js

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
// For a detailed explanation regarding each configuration property, visit:
2+
// https://jestjs.io/docs/en/configuration.html
3+
4+
module.exports = {
5+
// Automatically clear mock calls and instances between every test
6+
clearMocks: true,
7+
8+
// An array of glob patterns indicating a set of files for which coverage information should be collected
9+
collectCoverageFrom: ["src/**/*.{js,jsx,mjs}"],
10+
11+
// The directory where Jest should output its coverage files
12+
coverageDirectory: "coverage",
13+
14+
// An array of file extensions your modules use
15+
moduleFileExtensions: ["js", "json", "jsx"],
16+
17+
// The paths to modules that run some code to configure or set up the testing environment before each test
18+
setupFiles: ["<rootDir>/enzyme.config.js"],
19+
20+
// The test environment that will be used for testing
21+
testEnvironment: "jsdom",
22+
23+
// The glob patterns Jest uses to detect test files
24+
testMatch: ["**/__tests__/**/*.js?(x)", "**/?(*.)+(spec|test).js?(x)"],
25+
26+
// An array of regexp pattern strings that are matched against all test paths, matched tests are skipped
27+
testPathIgnorePatterns: ["\\\\node_modules\\\\"],
28+
29+
// This option sets the URL for the jsdom environment. It is reflected in properties such as location.href
30+
testURL: "http://localhost",
31+
32+
// An array of regexp pattern strings that are matched against all source file paths, matched files will skip transformation
33+
transformIgnorePatterns: ["<rootDir>/node_modules/"],
34+
35+
// Indicates whether each individual test should be reported during the run
36+
verbose: false
37+
};

client/package.json

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@
1818
"scripts": {
1919
"start": "webpack-dev-server --open",
2020
"build": "webpack --mode production",
21-
"test": "react-scripts test",
21+
"test": "jest",
22+
"test:watch": "jest --watch",
23+
"test:coverage": "jest --coverage --colors",
2224
"eject": "react-scripts eject"
2325
},
2426
"eslintConfig": {
@@ -37,19 +39,27 @@
3739
]
3840
},
3941
"devDependencies": {
42+
"@babel/polyfill": "^7.4.4",
4043
"@babel/preset-env": "^7.4.5",
4144
"@babel/preset-react": "^7.0.0",
4245
"@babel/preset-stage-0": "^7.0.0",
4346
"babel-cli": "^6.26.0",
4447
"babel-core": "^7.0.0-bridge.0",
45-
"babel-loader": "^7.1.5",
48+
"babel-loader": "^8.0.5",
4649
"css-loader": "^2.1.1",
50+
"enzyme": "^3.10.0",
51+
"enzyme-adapter-react-16": "^1.14.0",
4752
"extract-text-webpack-plugin": "^4.0.0-beta.0",
53+
"fetch-mock": "^7.3.9",
4854
"file-loader": "^4.0.0",
4955
"html-webpack-plugin": "^3.2.0",
56+
"jest": "^24.8.0",
5057
"mini-css-extract-plugin": "^0.7.0",
58+
"mocha": "^6.2.0",
59+
"nock": "^10.0.6",
5160
"node-sass": "^4.12.0",
5261
"path": "^0.12.7",
62+
"redux-mock-store": "^1.5.3",
5363
"sass-loader": "^7.1.0",
5464
"style-loader": "^0.23.1",
5565
"webpack": "^4.32.2",

client/src/App/App.js

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ import { PrivateRoute } from "../_components/PrivateRoute.js";
88
import { HomePage } from "../HomePage/HomePage.js";
99
import { LoginPage } from "../LoginPage/LoginPage.js";
1010
import { SignupPage } from "../SignupPage/SignupPage.js";
11-
import { VirtualMachine } from "../CreateAzureServices/VirtualMachine.js";
12-
import { VirtualNetwork } from "../CreateAzureServices/VirtualNetwork.js";
13-
import { Database } from "../CreateAzureServices/Database.js";
14-
import { Security } from "../CreateAzureServices/Security.js";
11+
import { VirtualMachine } from "../CreateServices/VirtualMachine.js";
12+
import { VirtualNetwork } from "../CreateServices/VirtualNetwork.js";
13+
import { Database } from "../CreateServices/Database.js";
14+
import { Security } from "../CreateServices/Security.js";
1515
import { PageNotFound } from "../_helpers/PageNotFound.js";
1616

1717
class App extends React.Component {
@@ -25,7 +25,6 @@ class App extends React.Component {
2525
});
2626
}
2727
render() {
28-
console.log("In app.js");
2928
const { alert } = this.props;
3029
return (
3130
<div>
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

client/src/_actions/user.actions.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ export const userActions = {
1818
function login(username, password) {
1919
return dispatch => {
2020
dispatch(request({ username }));
21-
2221
userService.login(username, password).then(user => {
2322
if (user.success) {
2423
dispatch(success(user));

0 commit comments

Comments
 (0)