deleted test modifications done to Gruntfile, Makefile and tests.html files.

b864cc1c · lucas.parsy · 5e8b8a5a · b864cc1c · b864cc1c · b864cc1c
Commit b864cc1c authored Nov 30, 2015 by lucas.parsy
Show whitespace changes
Inline Side-by-side

Showing with 38 additions and 40 deletions

Gruntfile.js Gruntfile.js +2 -5

Makefile Makefile +31 -31

test/tests.html test/tests.html +5 -4

No files found.
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -173,7 +173,7 @@ module.exports = function (grunt) {
          'src/jio.js',

          'node_modules/rusha/rusha.js',
-/*
+
          'src/jio.storage/replicatestorage.js',
          'src/jio.storage/shastorage.js',
          'src/jio.storage/uuidstorage.js',
@@ -181,17 +181,14 @@ module.exports = function (grunt) {
          'src/jio.storage/localstorage.js',
          'src/jio.storage/zipstorage.js',
          'src/jio.storage/cryptstorage.js',
-          'src/jio.storage/dropboxstorage.js',
-*/
          'src/jio.storage/websqlstorage.js',
+          'src/jio.storage/dropboxstorage.js',
          'src/jio.storage/davstorage.js',
-/*
          'src/jio.storage/unionstorage.js',
          'src/jio.storage/erp5storage.js',
          'src/jio.storage/querystorage.js',
          'src/jio.storage/drivetojiomapping.js',
          'src/jio.storage/documentstorage.js',
-*/
          'src/jio.storage/indexeddbstorage.js'
        ],
        dest: 'dist/<%= pkg.name %>-<%= pkg.version %>.js'

--- a/Makefile
+++ b/Makefile
@@ -34,22 +34,22 @@ zip:
 	@cp lib/rsvp/rsvp-custom.amd.js         $(TMPDIR)/jio/
 	@cp lib/jquery/jquery.js                $(TMPDIR)/jio/
 	@cp lib/require/require.js              $(TMPDIR)/jio/
-#	@cp src/jio.storage/localstorage.js     $(TMPDIR)/jio/storage/
-#	@cp src/jio.storage/davstorage.js       $(TMPDIR)/jio/storage/
-#	@cp src/jio.storage/dropboxstorage.js   $(TMPDIR)/jio/storage/
+	@cp src/jio.storage/localstorage.js     $(TMPDIR)/jio/storage/
+	@cp src/jio.storage/davstorage.js       $(TMPDIR)/jio/storage/
+	@cp src/jio.storage/dropboxstorage.js   $(TMPDIR)/jio/storage/
+	@cp src/jio.storage/erp5storage.js      $(TMPDIR)/jio/storage/
+	@cp src/jio.storage/indexstorage.js     $(TMPDIR)/jio/storage/
+	@cp src/jio.storage/gidstorage.js       $(TMPDIR)/jio/storage/
+	@cp src/jio.storage/replicatestorage.js $(TMPDIR)/jio/storage/
+	@cp src/jio.storage/splitstorage.js     $(TMPDIR)/jio/storage/
+	@cp src/jio.storage/cryptstorage.js     $(TMPDIR)/jio/storage/
+	@cp src/jio.storage/revisionstorage.js  $(TMPDIR)/jio/storage/
+	@cp src/jio.storage/zipstorage.js       $(TMPDIR)/jio/storage/
 	@cp src/jio.storage/websqlstorage.js       $(TMPDIR)/jio/storage/
-#	@cp src/jio.storage/erp5storage.js      $(TMPDIR)/jio/storage/
-#	@cp src/jio.storage/indexstorage.js     $(TMPDIR)/jio/storage/
-#	@cp src/jio.storage/gidstorage.js       $(TMPDIR)/jio/storage/
-#	@cp src/jio.storage/replicatestorage.js $(TMPDIR)/jio/storage/
-#	@cp src/jio.storage/splitstorage.js     $(TMPDIR)/jio/storage/
-#	@cp src/jio.storage/cryptstorage.js     $(TMPDIR)/jio/storage/
-#	@cp src/jio.storage/revisionstorage.js  $(TMPDIR)/jio/storage/
-#	@cp src/jio.storage/zipstorage.js       $(TMPDIR)/jio/storage/
-#	@cp src/jio.storage/replicaterevisionstorage.js     $(TMPDIR)/jio/storage/
-#	@cp src/jio.storage/s3storage.js        $(TMPDIR)/jio/storage/
-#	@cp src/jio.storage/splitstorage.js     $(TMPDIR)/jio/storage/
-#	@cp src/jio.storage/xwikistorage.js     $(TMPDIR)/jio/storage/
+	@cp src/jio.storage/replicaterevisionstorage.js     $(TMPDIR)/jio/storage/
+	@cp src/jio.storage/s3storage.js        $(TMPDIR)/jio/storage/
+	@cp src/jio.storage/splitstorage.js     $(TMPDIR)/jio/storage/
+	@cp src/jio.storage/xwikistorage.js     $(TMPDIR)/jio/storage/
 	@cd $(TMPDIR) && zip -q $(ZIP_FULL) -r jio
 	@mv $(TMPDIR)/$(ZIP_FULL) ./
 	@rm -rf $(TMPDIR)/jio
@@ -68,22 +68,22 @@ zip:
 	@$(UGLIFY) lib/rsvp/rsvp-custom.amd.js         >$(TMPDIR)/jio/rsvp-custom.amd.min.js 2>/dev/null
 	@cp lib/jquery/jquery.min.js                   $(TMPDIR)/jio/
 	@$(UGLIFY) lib/require/require.js              >$(TMPDIR)/jio/require.min.js 2>/dev/null
-#	@$(UGLIFY) src/jio.storage/localstorage.js     >$(TMPDIR)/jio/storage/localstorage.min.js 2>/dev/null
-#	@$(UGLIFY) src/jio.storage/davstorage.js       >$(TMPDIR)/jio/storage/davstorage.min.js 2>/dev/null
+	@$(UGLIFY) src/jio.storage/localstorage.js     >$(TMPDIR)/jio/storage/localstorage.min.js 2>/dev/null
+	@$(UGLIFY) src/jio.storage/davstorage.js       >$(TMPDIR)/jio/storage/davstorage.min.js 2>/dev/null
 	@$(UGLIFY) src/jio.storage/dropboxstorage.js   >$(TMPDIR)/jio/storage/dropboxstorage.min.js 2>/dev/null
-#	@$(UGLIFY) src/jio.storage/websqlstorage.js 	 >$(TMPDIR)/jio/storage/websqlstorage.min.js 2>/dev/null
-#	@$(UGLIFY) src/jio.storage/erp5storage.js      >$(TMPDIR)/jio/storage/erp5storage.min.js 2>/dev/null
-#	@$(UGLIFY) src/jio.storage/indexstorage.js     >$(TMPDIR)/jio/storage/indexstorage.min.js 2>/dev/null
-#	@$(UGLIFY) src/jio.storage/gidstorage.js       >$(TMPDIR)/jio/storage/gidstorage.min.js 2>/dev/null
-#	@$(UGLIFY) src/jio.storage/replicatestorage.js >$(TMPDIR)/jio/storage/replicatestorage.min.js 2>/dev/null
-#	@$(UGLIFY) src/jio.storage/splitstorage.js     >$(TMPDIR)/jio/storage/splitstorage.min.js 2>/dev/null
-#	@$(UGLIFY) src/jio.storage/cryptstorage.js     >$(TMPDIR)/jio/storage/cryptstorage.min.js 2>/dev/null
-#	@$(UGLIFY) src/jio.storage/revisionstorage.js     >$(TMPDIR)/jio/storage/revisionstorage.min.js 2>/dev/null
-#	@$(UGLIFY) src/jio.storage/replicaterevisionstorage.js     >$(TMPDIR)/jio/storage/replicaterevisionstorage.min.js 2>/dev/null
-#	@$(UGLIFY) src/jio.storage/zipstorage.js						 >$(TMPDIR)/jio/storage/zipstorage.min.js 2>/dev/null
-#	@$(UGLIFY) src/jio.storage/s3storage.js        >$(TMPDIR)/jio/storage/s3storage.min.js 2>/dev/null
-#	@$(UGLIFY) src/jio.storage/splitstorage.js     >$(TMPDIR)/jio/storage/splitstorage.min.js 2>/dev/null
-#	@$(UGLIFY) src/jio.storage/xwikistorage.js     >$(TMPDIR)/jio/storage/xwikistorage.min.js 2>/dev/null
+	@$(UGLIFY) src/jio.storage/erp5storage.js      >$(TMPDIR)/jio/storage/erp5storage.min.js 2>/dev/null
+	@$(UGLIFY) src/jio.storage/indexstorage.js     >$(TMPDIR)/jio/storage/indexstorage.min.js 2>/dev/null
+	@$(UGLIFY) src/jio.storage/gidstorage.js       >$(TMPDIR)/jio/storage/gidstorage.min.js 2>/dev/null
+	@$(UGLIFY) src/jio.storage/replicatestorage.js >$(TMPDIR)/jio/storage/replicatestorage.min.js 2>/dev/null
+	@$(UGLIFY) src/jio.storage/splitstorage.js     >$(TMPDIR)/jio/storage/splitstorage.min.js 2>/dev/null
+	@$(UGLIFY) src/jio.storage/cryptstorage.js     >$(TMPDIR)/jio/storage/cryptstorage.min.js 2>/dev/null
+	@$(UGLIFY) src/jio.storage/revisionstorage.js     >$(TMPDIR)/jio/storage/revisionstorage.min.js 2>/dev/null
+	@$(UGLIFY) src/jio.storage/replicaterevisionstorage.js     >$(TMPDIR)/jio/storage/replicaterevisionstorage.min.js 2>/dev/null
+	@$(UGLIFY) src/jio.storage/zipstorage.js						 >$(TMPDIR)/jio/storage/zipstorage.min.js 2>/dev/null
+	@$(UGLIFY) src/jio.storage/websqlstorage.js					 >$(TMPDIR)/jio/storage/websqlstorage.min.js 2>/dev/null
+	@$(UGLIFY) src/jio.storage/s3storage.js        >$(TMPDIR)/jio/storage/s3storage.min.js 2>/dev/null
+	@$(UGLIFY) src/jio.storage/splitstorage.js     >$(TMPDIR)/jio/storage/splitstorage.min.js 2>/dev/null
+	@$(UGLIFY) src/jio.storage/xwikistorage.js     >$(TMPDIR)/jio/storage/xwikistorage.min.js 2>/dev/null
 	@cd $(TMPDIR) && zip -q $(ZIP_MINI) -r jio
 	@mv $(TMPDIR)/$(ZIP_MINI) ./
 	@rm -rf $(TMPDIR)

--- a/test/tests.html
+++ b/test/tests.html
@@ -17,7 +17,7 @@
  <!--script src="jio/util.js"></script-->
  <!--script src="jio/fakestorage.js"></script>
  <script src="jio/tests.js"></script-->
-<!--lucas>
+
  <script src="queries/key.tests.js"></script>
  <script src="queries/key-schema.tests.js"></script>
  <script src="queries/tests.js"></script>
@@ -27,7 +27,7 @@
  <script src="queries/key-jiodate.tests.js"></script>

  <!--script src="queries/key-localstorage.tests.js"></script-->
-<!--lucas>
+
  <script src="jio.storage/memorystorage.tests.js"></script>
  <script src="jio.storage/querystorage.tests.js"></script>
  <script src="jio.storage/localstorage.tests.js"></script>
@@ -40,12 +40,13 @@
  <script src="jio.storage/uuidstorage.tests.js"></script>
  <script src="jio.storage/replicatestorage.tests.js"></script>
  <script src="jio.storage/shastorage.tests.js"></script>
-  <script src="jio.storage/indexstorage.tests.js"></script>
+
+  <!--script src="jio.storage/indexstorage.tests.js"></script-->
  <script src="jio.storage/cryptstorage.tests.js"></script>
  <script src="jio.storage/dropboxstorage.tests.js"></script>
  <script src="jio.storage/zipstorage.tests.js"></script>
-<!--lucas-->
  <script src="jio.storage/websqlstorage.tests.js"></script>
+
  <!--script src="../lib/jquery/jquery.min.js"></script>
  <script src="../src/jio.storage/xwikistorage.js"></script>
  <script src="jio.storage/xwikistorage.tests.js"></script-->