Skip to content

Commit 51e91b3

Browse files
authored
Merge branch 'dev' into 64-timeline-component
2 parents f8e1c0c + 3327a16 commit 51e91b3

30 files changed

Lines changed: 4770 additions & 1965 deletions

.travis.yml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
language: node_js
2+
node_js:
3+
- 8.9.4
4+
cache:
5+
directories:
6+
- $HOME/.npm
7+
branches:
8+
only:
9+
- master
10+
- dev
11+
install:
12+
- npm i -g npm@5.7.1
13+
- npm ci
14+
before_script:
15+
- npm install -g ionic cordova jest
16+
notifications:
17+
webhooks:
18+
urls:
19+
- https://hooks.glip.com/webhook/6d688e2d-f076-4521-8213-f2479e99afe6
20+
on_success: never
21+
on_failure: always
22+
on_start: never
23+
script:
24+
- npm run test-ci
25+
deploy:
26+
provider: heroku
27+
api_key: $HEROKU_KEY
28+
app: ssf-reboot
29+
on:
30+
repo: SoftStackFactory/reboot

Procfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
web: npm run build:dev && npm start
1+
web: npm run build:dev && npm start

README.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1+
![Travis CI Status](https://travis-ci.org/SoftStackFactory/reboot.svg?branch=master "Travis CI Status")
2+
3+
14
# Reboot
25

3-
Reboot is:
6+
Reboot is an ionic application that assists verterans reintegrate into civilian life by assisting them and providing information and resources along the way.
47

58
## Getting Started
69

config/webpack.config.js

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
var chalk = require("chalk");
2+
var fs = require('fs');
3+
var path = require('path');
4+
var useDefaultConfig = require('@ionic/app-scripts/config/webpack.config.js');
5+
6+
var env = process.env.IONIC_ENV;
7+
8+
useDefaultConfig.prod.resolve.alias = {
9+
"@app/env": path.resolve(environmentPath('prod'))
10+
};
11+
12+
useDefaultConfig.dev.resolve.alias = {
13+
"@app/env": path.resolve(environmentPath('dev'))
14+
};
15+
16+
if (env !== 'prod' && env !== 'dev') {
17+
// Default to dev config
18+
useDefaultConfig[env] = useDefaultConfig.dev;
19+
useDefaultConfig[env].resolve.alias = {
20+
"@app/env": path.resolve(environmentPath(env))
21+
};
22+
}
23+
24+
function environmentPath(env) {
25+
var filePath = './src/environments/environments' + (env === 'prod' ? '' : '.' + env) + '.ts';
26+
if (!fs.existsSync(filePath)) {
27+
console.log(chalk.red('\n' + filePath + ' does not exist!'));
28+
} else {
29+
return filePath;
30+
}
31+
}
32+
33+
module.exports = function () {
34+
return useDefaultConfig;
35+
};

jest.config.js

Lines changed: 185 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,185 @@
1+
// For a detailed explanation regarding each configuration property, visit:
2+
// https://jestjs.io/docs/en/configuration.html
3+
4+
module.exports = {
5+
// All imported modules in your tests should be mocked automatically
6+
// automock: false,
7+
8+
// Stop running tests after the first failure
9+
// bail: false,
10+
11+
// Respect "browser" field in package.json when resolving modules
12+
// browser: false,
13+
14+
// The directory where Jest should store its cached dependency information
15+
// cacheDirectory: "/var/folders/9q/htffx9t511j88x7hlfrvxvfm0000gn/T/jest_dx",
16+
17+
// Automatically clear mock calls and instances between every test
18+
// clearMocks: false,
19+
20+
// Indicates whether the coverage information should be collected while executing the test
21+
// collectCoverage: false,
22+
23+
// An array of glob patterns indicating a set of files for which coverage information should be collected
24+
// collectCoverageFrom: null,
25+
26+
// The directory where Jest should output its coverage files
27+
// coverageDirectory: null,
28+
29+
// An array of regexp pattern strings used to skip coverage collection
30+
// coveragePathIgnorePatterns: [
31+
// "/node_modules/"
32+
// ],
33+
34+
// A list of reporter names that Jest uses when writing coverage reports
35+
// coverageReporters: [
36+
// "json",
37+
// "text",
38+
// "lcov",
39+
// "clover"
40+
// ],
41+
42+
// An object that configures minimum threshold enforcement for coverage results
43+
// coverageThreshold: null,
44+
45+
// Make calling deprecated APIs throw helpful error messages
46+
// errorOnDeprecated: false,
47+
48+
// Force coverage collection from ignored files usin a array of glob patterns
49+
// forceCoverageMatch: [],
50+
51+
// A path to a module which exports an async function that is triggered once before all test suites
52+
// globalSetup: null,
53+
54+
// A path to a module which exports an async function that is triggered once after all test suites
55+
// globalTeardown: null,
56+
57+
// A set of global variables that need to be available in all test environments
58+
globals: {
59+
"ts-jest": {
60+
"tsConfigFile": "tsconfig.json"
61+
}
62+
},
63+
64+
// An array of directory names to be searched recursively up from the requiring module's location
65+
// moduleDirectories: [
66+
// "node_modules"
67+
// ],
68+
69+
// An array of file extensions your modules use
70+
moduleFileExtensions: [
71+
"ts",
72+
"tsx",
73+
"js",
74+
"json"
75+
],
76+
77+
// A map from regular expressions to module names that allow to stub out resources with a single module
78+
// moduleNameMapper: {},
79+
80+
// An array of regexp pattern strings, matched against all module paths before considered 'visible' to the module loader
81+
// modulePathIgnorePatterns: [],
82+
83+
// Activates notifications for test results
84+
// notify: false,
85+
86+
// An enum that specifies notification mode. Requires { notify: true }
87+
// notifyMode: "always",
88+
89+
// A preset that is used as a base for Jest's configuration
90+
// preset: null,
91+
92+
// Run tests from one or more projects
93+
// projects: null,
94+
95+
// Use this configuration option to add custom reporters to Jest
96+
// reporters: undefined,
97+
98+
// Automatically reset mock state between every test
99+
// resetMocks: false,
100+
101+
// Reset the module registry before running each individual test
102+
// resetModules: false,
103+
104+
// A path to a custom resolver
105+
// resolver: null,
106+
107+
// Automatically restore mock state between every test
108+
// restoreMocks: false,
109+
110+
// The root directory that Jest should scan for tests and modules within
111+
// rootDir: null,
112+
113+
// A list of paths to directories that Jest should use to search for files in
114+
// roots: [
115+
// "<rootDir>"
116+
// ],
117+
118+
// Allows you to use a custom runner instead of Jest's default test runner
119+
// runner: "jest-runner",
120+
121+
// The paths to modules that run some code to configure or set up the testing environment before each test
122+
// setupFiles: [],
123+
124+
// The path to a module that runs some code to configure or set up the testing framework before each test
125+
// setupTestFrameworkScriptFile: null,
126+
127+
// A list of paths to snapshot serializer modules Jest should use for snapshot testing
128+
// snapshotSerializers: [],
129+
130+
// The test environment that will be used for testing
131+
testEnvironment: "node",
132+
133+
// Options that will be passed to the testEnvironment
134+
// testEnvironmentOptions: {},
135+
136+
// Adds a location field to test results
137+
// testLocationInResults: false,
138+
139+
// The glob patterns Jest uses to detect test files
140+
// testMatch: [
141+
// "**/__tests__/*.+(ts|tsx|js)"
142+
// ],
143+
144+
// An array of regexp pattern strings that are matched against all test paths, matched tests are skipped
145+
// testPathIgnorePatterns: [
146+
// "/node_modules/"
147+
// ],
148+
149+
// The regexp pattern Jest uses to detect test files
150+
testRegex: "(/__tests__/.*|\\.(test|spec))\\.(ts|tsx|js)$",
151+
152+
// This option allows the use of a custom results processor
153+
// testResultsProcessor: null,
154+
155+
// This option allows use of a custom test runner
156+
// testRunner: "jasmine2",
157+
158+
// This option sets the URL for the jsdom environment. It is reflected in properties such as location.href
159+
// testURL: "http://localhost",
160+
161+
// Setting this value to "fake" allows the use of fake timers for functions such as "setTimeout"
162+
// timers: "real",
163+
164+
// A map from regular expressions to paths to transformers
165+
transform: {
166+
"^.+\\.(ts|tsx)$": "ts-jest"
167+
},
168+
169+
// An array of regexp pattern strings that are matched against all source file paths, matched files will skip transformation
170+
// transformIgnorePatterns: [
171+
// "/node_modules/"
172+
// ],
173+
174+
// An array of regexp pattern strings that are matched against all modules before the module loader will automatically return a mock for them
175+
// unmockedModulePathPatterns: undefined,
176+
177+
// Indicates whether each individual test should be reported during the run
178+
// verbose: null,
179+
180+
// An array of regexp patterns that are matched against all source file paths before re-running tests in watch mode
181+
// watchPathIgnorePatterns: [],
182+
183+
// Whether to use watchman for file crawling
184+
// watchman: true,
185+
};

0 commit comments

Comments
 (0)