@@ -73,30 +73,33 @@ const env = (function(injectedEnv) {
7373 assign ( process . env , this . _originalEnv ) ;
7474 return this ;
7575 }
76- injected ( ) {
76+ injected ( ) {
7777 return assign ( { } , injectedEnv ) ;
7878 }
7979 }
8080 return new InstancedEnv ( ) ;
8181} ( require ( '../../../system-test/env.js' ) ) ) ;
82- const SHOULD_RUN = ( function ( ) {
82+ const SHOULD_RUN = ( function ( ) {
8383 if ( ! isString ( env . injected ( ) . projectId ) ) {
8484 return new Error ( 'The project id (projectId) was not set in the env' ) ;
85- } else if ( ! isString ( env . injected ( ) . apiKey ) ) {
85+ }
86+ if ( ! isString ( env . injected ( ) . apiKey ) ) {
8687 return new Error ( 'The api key (apiKey) was not set as an env variable' ) ;
87- } else if ( ! isString ( env . injected ( ) . projectNumber ) ) {
88+ }
89+ if ( ! isString ( env . injected ( ) . projectNumber ) ) {
8890 return new Error (
8991 'The project number (projectNumber) was not set in the env' ) ;
90- } else if ( ! isString ( env . injected ( ) . keyFilename ) ) {
92+ }
93+ if ( ! isString ( env . injected ( ) . keyFilename ) ) {
9194 return new Error (
9295 'The key filename (keyFilename) was not set in the env' ) ;
9396 }
9497 return true ;
9598} ( ) ) ;
96- const TEST_RUNNER = ( function ( ) {
99+ const TEST_RUNNER = ( function ( ) {
97100 if ( SHOULD_RUN instanceof Error ) {
98101 console . log ( 'Skipping error-reporting system tests:' ) ;
99- console . log ( ' ' + SHOULD_RUN . message ) ;
102+ console . log ( ' ' + SHOULD_RUN . message ) ;
100103 return describe . skip ;
101104 }
102105 return describe ;
@@ -183,19 +186,6 @@ const TEST_RUNNER = (function () {
183186 describe ( 'System-live integration testing' , function ( ) {
184187 var sampleError = new Error ( ERR_TOKEN ) ;
185188 var errorMessage = new ErrorMessage ( ) . setMessage ( sampleError . stack ) ;
186- // var oldEnv = {
187- // GCLOUD_PROJECT: env.projectId,
188- // STUBBED_PROJECT_NUM: env.projectNumber,
189- // NODE_ENV: process.env.NODE_ENV
190- // };
191- // function sterilizeEnv() {
192- // forEach(oldEnv, function(val, key) {
193- // delete process.env[key];
194- // });
195- // }
196- // function restoreEnv() {
197- // assign(process.env, oldEnv);
198- // }
199189 describe ( 'Client creation' , function ( ) {
200190 describe ( 'Using only project id' , function ( ) {
201191 describe ( 'As a runtime argument' , function ( ) {
0 commit comments