Merge pull request #1752 from acozzette/fix-js-tests

Fixed failing JS tests

Merge pull request #1752 from acozzette/fix-js-tests
Fixed failing JS tests
c10938a1 · Adam Cozzette · GitHub · ec458973 · c64d86ed · c10938a1
Commit c10938a1 authored Jul 06, 2016 by Adam Cozzette Committed by GitHub Jul 06, 2016
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

map.js js/map.js +0 -0

test.proto js/test.proto +4 -0

testbinary.proto js/testbinary.proto +0 -2

No files found.
--- a/js/map.js
+++ b/js/map.js
--- a/js/test.proto
+++ b/js/test.proto
@@ -229,3 +229,7 @@ message TestMessageWithOneof {
  }
 }

+message TestEndsWithBytes {
+  optional int32 value = 1;
+  optional bytes data = 2;
+}
--- a/js/testbinary.proto
+++ b/js/testbinary.proto
@@ -185,8 +185,6 @@ extend TestExtendable {
 }

 message TestMapFields {
-  option (jspb.generate_from_object) = true;
-
  map<string, string> map_string_string = 1;
  map<string, int32> map_string_int32 = 2;
  map<string, int64> map_string_int64 = 3;