Merge pull request #241 from BranchMetrics/eneff-fix-testing

fix: minor style changes and es6 fixes
BranchMetrics · Nov 17, 2016 · 1e38f77 · 1e38f77
2 parents be4df83 + 58c4ee8
commit 1e38f77
Show file tree

Hide file tree

Showing 7 changed files with 389 additions and 407 deletions.
diff --git a/DEVELOPING.md b/DEVELOPING.md
@@ -53,7 +53,7 @@ npm install;
 > Build
 
 ```sh
-gulp predev;
+gulp prerelease;
 ```
 
 > **[optional]** Update [iOS SDK](https://github.com/BranchMetrics/ios-branch-deep-linking/tags) (will need to update `plugin.xml` dependencies if new iOS files)

diff --git a/gulpfile.js b/gulpfile.js
@@ -1,12 +1,11 @@
-var gulp       = require('gulp');
-var fs         = require('fs');
+var gulp = require('gulp');
+var fs = require('fs');
 var sourcemaps = require('gulp-sourcemaps');
-var babel      = require('gulp-babel');
-var eslint     = require('gulp-eslint');
-var jscs       = require('gulp-jscs');
+var babel = require('gulp-babel');
+var eslint = require('gulp-eslint');
+var jscs = require('gulp-jscs');
 
 gulp.task('prerelease', [ 'setupNpm', 'babel', 'lint' ]);
-gulp.task('predev', [ 'setupDev', 'babel', 'lint' ]);
 
 // -----------------------------------------------------------------------------
 // setup for development use
@@ -33,8 +32,8 @@ function genNpmPluginXML() {
   files = files.concat(emitFiles(root + 'Branch-SDK/Requests/'));
 
   var newLineIndent = '\n        ';
-  xml = xml.replace('<!--[Branch Framework Reference]-->', newLineIndent
-    + files.join(newLineIndent));
+  xml = xml.replace('<!--[Branch Framework Reference]-->', newLineIndent +
+    files.join(newLineIndent));
 
   fs.writeFileSync('plugin.xml', xml);
 };
@@ -67,10 +66,10 @@ function setIosNpmOrDev(npmOrDev) {
   if (npmOrDev === 'npm') {
     content = '#define BRANCH_NPM true';
   }
-else if (npmOrDev === 'dev') {
+  else if (npmOrDev === 'dev') {
     content = '//empty';
   }
-else {
+  else {
     throw new Error('expected deployed|local, not ' + deployedOrLocal);
   }
   fs.writeFileSync('src/ios/BranchNPM.h', content + '\n');
@@ -84,7 +83,7 @@ function emitFiles(path) {
     if (filename.match(/\.m$/)) {
       fileType = 'source';
     }
-else if (filename.match(/\.h$/) || filename.match(/\.pch$/)) {
+    else if (filename.match(/\.h$/) || filename.match(/\.pch$/)) {
       fileType = 'header';
     }
     if (fileType) {
@@ -111,11 +110,11 @@ function babelize(taskName, dir) {
   });
   gulp.task(taskName + '-babel', [ taskName + '-copy' ], () => {
     return gulp.src(srcPattern)
-      .pipe(sourcemaps.init())
-      .pipe(babel({
-        presets: [ 'es2015', 'stage-2' ]
-      }))
-      .pipe(gulp.dest(destDir));
+    .pipe(sourcemaps.init())
+    .pipe(babel({
+      presets: [ 'es2015', 'stage-2' ]
+    }))
+    .pipe(gulp.dest(destDir));
   });
 }
 
@@ -131,30 +130,32 @@ gulp.task('babel', babelTasks);
 gulp.task('lint', [ 'eslint', 'jscs-lint' ]);
 
 var srcs = [
-  'hooks.es6/**/*.js',
-  'www.es6/**/*.js',
-  'gulpfile.js',
-  'tests.es6/**/*.js',
-  'testbed/www/js.es6/**/*.js',
-  '!node_modules/**',
-  '!testbed/platforms/**',
-  '!testbed/plugins/**',
-  '!tests-harness/platforms/**',
-  '!tests-harness/plugins/**'
+'hooks.es6/**/*.js',
+'www.es6/**/*.js',
+'gulpfile.js',
+'tests.es6/**/*.js',
+'testbed/www/js.es6/**/*.js',
+'!node_modules/**',
+'!testbed/platforms/**',
+'!testbed/plugins/**',
+'!tests-harness/platforms/**',
+'!tests-harness/plugins/**'
 ];
 
 gulp.task('eslint', () => {
   return gulp.src(srcs)
-    .pipe(eslint())
-    .pipe(eslint.format())
-    .pipe(eslint.failAfterError());
+  .pipe(eslint())
+  .pipe(eslint.format())
+  .pipe(eslint.failAfterError());
 });
 
 function jscsTask(fix) {
   var ret = gulp.src(srcs)
-    .pipe(jscs({ fix: fix }))
-    .pipe(jscs.reporter())
-    .pipe(jscs.reporter('fail'));
+  .pipe(jscs({
+    fix: fix
+  }))
+  .pipe(jscs.reporter())
+  .pipe(jscs.reporter('fail'));
   if (fix) {
     ret.pipe(gulp.dest('.'));
   }

diff --git a/plugin.xml b/plugin.xml
@@ -105,14 +105,14 @@ SOFTWARE.
         <header-file src="src/ios/BranchSDK.h" />
         <source-file src="src/ios/BranchSDK.m" />
         <source-file src="src/ios/AppDelegate+BranchSdk.m" />
-
+        
         <header-file src="src/ios/dependencies/Fabric/ANSCompatibility.h" />
         <header-file src="src/ios/dependencies/Fabric/Answers.h" />
         <header-file src="src/ios/dependencies/Fabric/FABAttributes.h" />
         <header-file src="src/ios/dependencies/Fabric/FABKitProtocol.h" />
         <header-file src="src/ios/dependencies/Fabric/Fabric+FABKits.h" />
         <header-file src="src/ios/dependencies/Fabric/Fabric.h" />
-
+        
         <header-file src="src/ios/dependencies/Branch-SDK/BNCCallbacks.h" />
         <header-file src="src/ios/dependencies/Branch-SDK/BNCConfig.h" />
         <header-file src="src/ios/dependencies/Branch-SDK/BNCContentDiscoveryManager.h" />
@@ -167,7 +167,7 @@ SOFTWARE.
         <source-file src="src/ios/dependencies/Branch-SDK/BranchView.m" />
         <header-file src="src/ios/dependencies/Branch-SDK/BranchViewHandler.h" />
         <source-file src="src/ios/dependencies/Branch-SDK/BranchViewHandler.m" />
-
+        
         <header-file src="src/ios/dependencies/Branch-SDK/Requests/BNCServerRequest.h" />
         <source-file src="src/ios/dependencies/Branch-SDK/Requests/BNCServerRequest.m" />
         <header-file src="src/ios/dependencies/Branch-SDK/Requests/BranchCloseRequest.h" />
@@ -197,6 +197,6 @@ SOFTWARE.
         <header-file src="src/ios/dependencies/Branch-SDK/Requests/BranchUserCompletedActionRequest.h" />
         <source-file src="src/ios/dependencies/Branch-SDK/Requests/BranchUserCompletedActionRequest.m" />
         <header-file src="src/ios/dependencies/Branch-SDK/Requests/PromoViewHandler.h" />
-
+        
     </platform>
 </plugin>