resolve merge conflicts and fix linter

googleapis · Apr 29, 2020 · 118c524 · 118c524
1 parent 9e466b2
commit 118c524
Show file tree

Hide file tree

Showing 9 changed files with 93 additions and 311 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,11 +9,7 @@ build/
 system-test/secrets.js
 system-test/*key.json
 *.lock
-<<<<<<< HEAD
-=======
 build/
 package-lock.json
->>>>>>> master
 .DS_Store
-package-lock.json
 __pycache__
diff --git a/dev/protos/firestore_v1_proto_api.js b/dev/protos/firestore_v1_proto_api.js
diff --git a/dev/src/index.ts b/dev/src/index.ts
@@ -43,11 +43,7 @@ import {Timestamp} from './timestamp';
 import {parseGetAllArguments, Transaction} from './transaction';
 import {
   ApiMapValue,
-<<<<<<< HEAD
-=======
   BulkWriterOptions,
-  DocumentData,
->>>>>>> master
   FirestoreStreamingMethod,
   FirestoreUnaryMethod,
   GapicClient,

diff --git a/dev/src/rate-limiter.ts b/dev/src/rate-limiter.ts
@@ -15,8 +15,6 @@
  */
 import * as assert from 'assert';
 
-import {Timestamp} from './timestamp';
-
 /**
  * A helper that uses the Token Bucket algorithm to rate limit the number of
  * operations that can be made in a second.

diff --git a/dev/src/write-batch.ts b/dev/src/write-batch.ts
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-import * as assert from 'assert';
-
 import {google} from '../protos/firestore_v1_proto_api';
 import {
   DocumentMask,

diff --git a/dev/test/bulk-writer.ts b/dev/test/bulk-writer.ts
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+import {describe, it, beforeEach, afterEach} from 'mocha';
 import {expect} from 'chai';
 import {Status} from 'google-gax';
 

diff --git a/dev/test/gapic_firestore_v1.ts b/dev/test/gapic_firestore_v1.ts
@@ -1259,7 +1259,6 @@ describe('v1.FirestoreClient', () => {
         new protos.google.firestore.v1.WriteRequest()
       );
       request.database = '';
-      const expectedHeaderRequestParams = 'database=';
       const expectedError = new Error('expected');
       client.innerApiCalls.write = stubBidiStreamingCall(
         undefined,
@@ -1349,7 +1348,6 @@ describe('v1.FirestoreClient', () => {
         new protos.google.firestore.v1.ListenRequest()
       );
       request.database = '';
-      const expectedHeaderRequestParams = 'database=';
       const expectedError = new Error('expected');
       client.innerApiCalls.listen = stubBidiStreamingCall(
         undefined,

diff --git a/dev/test/gapic_firestore_v1beta1.ts b/dev/test/gapic_firestore_v1beta1.ts
@@ -1263,7 +1263,6 @@ describe('v1beta1.FirestoreClient', () => {
         new protos.google.firestore.v1beta1.WriteRequest()
       );
       request.database = '';
-      const expectedHeaderRequestParams = 'database=';
       const expectedError = new Error('expected');
       client.innerApiCalls.write = stubBidiStreamingCall(
         undefined,
@@ -1353,7 +1352,6 @@ describe('v1beta1.FirestoreClient', () => {
         new protos.google.firestore.v1beta1.ListenRequest()
       );
       request.database = '';
-      const expectedHeaderRequestParams = 'database=';
       const expectedError = new Error('expected');
       client.innerApiCalls.listen = stubBidiStreamingCall(
         undefined,

diff --git a/dev/test/rate-limiter.ts b/dev/test/rate-limiter.ts
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+import {describe, it, beforeEach} from 'mocha';
 import {expect} from 'chai';
 
 import {RateLimiter} from '../src/rate-limiter';