Skip to content

Commit 67ef607

Browse files
authored
Fixing Build and Test Automation (#251)
* Debugging * fixing build * debugging * Debugging
1 parent 0a4ab24 commit 67ef607

7 files changed

Lines changed: 42 additions & 48 deletions

File tree

.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,5 @@ jspm_packages
4343
.vagrant
4444
*.retry
4545

46-
#gagarin
47-
.gagarin
46+
# Build Directory
47+
build

.meteor/packages

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66

77
## METEOR CORE
88
meteor-base@1.1.0 # Packages every Meteor app needs to have
9-
mongo@1.1.18 # The database Meteor supports right now
9+
mongo@1.2.0 # The database Meteor supports right now
1010
reactive-var@1.0.11 # Reactive variable for tracker
1111
tracker@1.1.3 # Meteor's client-side reactive programming library
1212

1313
## PRODUCTION ENHANCEMENTS
1414
standard-minifier-css@1.3.4 # CSS minifier run for production mode
15-
standard-minifier-js@2.1.1 # JS minifier run for production mode
15+
abernix:standard-minifier-js@1.3.2 # JS minifier
1616
es5-shim@4.6.15 # ECMAScript 5 compatibility for older browsers.
1717

1818
## ANGULAR
@@ -24,9 +24,9 @@ aldeed:schema-index
2424

2525
## TESTING
2626
meteortesting:mocha
27-
dynamic-import
27+
dynamic-import@0.1.1
2828

2929
## ACCOUNTS
30-
accounts-password
31-
accounts-google
32-
service-configuration
30+
accounts-password@1.4.0
31+
accounts-google@1.2.0
32+
service-configuration@1.0.11

.meteor/release

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
METEOR@1.5.1
1+
METEOR@1.5.2

.meteor/versions

Lines changed: 23 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,73 +1,68 @@
1-
accounts-base@1.3.1
1+
abernix:minifier-js@1.3.19
2+
abernix:standard-minifier-js@1.3.19
3+
accounts-base@1.3.2
24
accounts-google@1.2.0
35
accounts-oauth@1.1.15
46
accounts-password@1.4.0
57
aldeed:collection2-core@2.0.1
68
aldeed:schema-index@2.0.0
7-
allow-deny@1.0.6
9+
allow-deny@1.0.9
810
angular2-compilers@0.6.6
911
autoupdate@1.3.12
10-
babel-compiler@6.19.4
12+
babel-compiler@6.20.0
1113
babel-runtime@1.0.1
1214
barbatus:caching-compiler@1.1.9
13-
barbatus:css-compiler@0.3.6
15+
barbatus:css-compiler@0.4.1
1416
barbatus:scss-compiler@3.8.3
15-
barbatus:typescript@0.6.7
16-
barbatus:typescript-compiler@0.9.7
17-
barbatus:typescript-runtime@1.0.1
17+
barbatus:typescript@0.6.11
18+
barbatus:typescript-compiler@0.9.11
19+
barbatus:typescript-runtime@1.0.2
1820
base64@1.0.10
1921
binary-heap@1.0.10
20-
blaze@2.3.2
21-
blaze-tools@1.0.10
22-
boilerplate-generator@1.1.1
22+
boilerplate-generator@1.2.0
2323
caching-compiler@1.1.9
2424
callback-hook@1.0.10
2525
check@1.2.5
2626
ddp@1.3.0
27-
ddp-client@2.0.0
27+
ddp-client@2.1.1
2828
ddp-common@1.2.9
2929
ddp-rate-limiter@1.0.7
3030
ddp-server@2.0.0
31-
deps@1.0.12
3231
diff-sequence@1.0.7
3332
dynamic-import@0.1.1
34-
ecmascript@0.8.1
33+
ecmascript@0.8.2
3534
ecmascript-runtime@0.4.1
36-
ecmascript-runtime-client@0.4.2
35+
ecmascript-runtime-client@0.4.3
3736
ecmascript-runtime-server@0.4.1
38-
ejson@1.0.13
37+
ejson@1.0.14
3938
email@1.2.3
4039
es5-shim@4.6.15
4140
geojson-utils@1.0.10
4241
google-oauth@1.2.4
4342
hot-code-push@1.0.4
44-
html-tools@1.0.11
45-
htmljs@1.0.11
4643
http@1.2.12
4744
id-map@1.0.9
48-
jquery@1.11.10
4945
livedata@1.0.18
50-
localstorage@1.1.0
46+
localstorage@1.1.1
5147
logging@1.1.17
52-
meteor@1.7.0
48+
meteor@1.7.1
5349
meteor-base@1.1.0
5450
meteortesting:browser-tests@0.1.1
5551
meteortesting:mocha@0.4.4
5652
minifier-css@1.2.16
57-
minifier-js@2.1.1
58-
minimongo@1.2.1
59-
modules@0.9.2
53+
minimongo@1.3.1
54+
modules@0.10.0
6055
modules-runtime@0.8.0
61-
mongo@1.1.19
56+
mongo@1.2.0
57+
mongo-dev-server@1.0.1
6258
mongo-id@1.0.6
6359
npm-bcrypt@0.9.3
64-
npm-mongo@2.2.24
60+
npm-mongo@2.2.30
6561
oauth@1.1.13
6662
oauth2@1.1.11
67-
observe-sequence@1.0.16
6863
ordered-dict@1.0.9
6964
practicalmeteor:mocha-core@1.0.1
70-
promise@0.8.9
65+
promise@0.9.0
7166
raix:eventemitter@0.1.3
7267
random@1.0.10
7368
rate-limit@1.0.8
@@ -77,16 +72,12 @@ retry@1.0.9
7772
routepolicy@1.0.12
7873
service-configuration@1.0.11
7974
sha@1.0.9
80-
spacebars@1.0.15
81-
spacebars-compiler@1.1.2
8275
srp@1.0.10
8376
standard-minifier-css@1.3.4
84-
standard-minifier-js@2.1.1
8577
tmeasday:check-npm-versions@0.3.1
8678
tracker@1.1.3
87-
ui@1.0.13
8879
underscore@1.0.10
8980
urigo:static-html-compiler@0.1.8
9081
url@1.1.0
91-
webapp@1.3.17
82+
webapp@1.3.19
9283
webapp-hashing@1.0.9

imports/test/fixtures/index.ts

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import { Users } from '../../../both/collections/user.collection';
2525
import { addRoleForCourse } from '../../../server/methods/user.methods';
2626

27-
2827
/*
2928
* cleanupDatabase
3029
* cleans up databases
@@ -71,6 +70,8 @@
7170
},
7271
global_admin: true,
7372
roles: []
73+
}, () => {
74+
Accounts.setPassword(this.users["global_admin"], "global_admin");
7475
}),
7576

7677
"course_admin": Users.insert({
@@ -83,6 +84,8 @@
8384
},
8485
global_admin: false,
8586
roles: []
87+
}, () => {
88+
Accounts.setPassword(this.users["course_admin"], "course_admin");
8689
}),
8790

8891
"instructor": Users.insert({
@@ -95,6 +98,8 @@
9598
},
9699
global_admin: false,
97100
roles: []
101+
}, () => {
102+
Accounts.setPassword(this.users["instructor"], "instructor");
98103
}),
99104

100105
"student": Users.insert({
@@ -107,15 +112,11 @@
107112
},
108113
global_admin: false,
109114
roles: []
115+
}, () => {
116+
Accounts.setPassword(this.users["student"], "student");
110117
})
111118
};
112119

113-
114-
Accounts.setPassword(this.users["global_admin"], "global_admin");
115-
Accounts.setPassword(this.users["course_admin"], "course_admin");
116-
Accounts.setPassword(this.users["instructor"], "instructor");
117-
Accounts.setPassword(this.users["student"], "student");
118-
119120
// Courses
120121
this.courses = ({
121122
"gpi" : Courses.insert({

server/imports/runtime/lab_runtime.app-test.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ export function runTest(){
2424
let lab_id_mongo : string;
2525

2626
before(function(){
27+
cleanupDatabase();
2728
fixtures = new DefaultFixtures();
2829
});
2930

server/imports/runtime/session.app-test.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ export function runTest(){
2222
var session : Session;
2323

2424
before(() => {
25+
cleanupDatabase();
2526
fixtures = new DefaultFixtures();
2627
user = fixtures.users["course_admin"];
2728
lab = fixtures.labs["gpi/git"];

0 commit comments

Comments
 (0)