fix tests

jin-qu · Dec 5, 2018 · 03c013f · 03c013f
1 parent 64df393
commit 03c013f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/lib/odata-query-provider.ts b/lib/odata-query-provider.ts
@@ -50,8 +50,8 @@ export class ODataQueryProvider implements IQueryProvider {
             else if (~thenFuncs.indexOf(part.type)) {
                 orders.push(part);
             }
-            else if (!~otherFuncs.indexOf(part.type)) {
-                params[part.type] = part;
+            else if (~otherFuncs.indexOf(part.type)) {
+                params[part.type] = part.args[0];
             }
             else throw new Error(`${part.type} is not supported.`);
         }

diff --git a/lib/odata-query.ts b/lib/odata-query.ts
@@ -68,8 +68,8 @@ export class ODataQuery<T> implements IODataQuery<T> {
 export interface IODataQuery<T> extends IQueryBase {
     inlineCount(value?: boolean): IODataQuery<T>;
     where(predicate: Predicate<T>, ...scopes): IODataQuery<T>;
-    orderBy(keySelector: Func1<T>, ...scopes): IODataQuery<T>;
-    orderByDescending(keySelector: Func1<T>, ...scopes): IODataQuery<T>;
+    orderBy(keySelector: Func1<T>, ...scopes): IOrderedODataQuery<T>;
+    orderByDescending(keySelector: Func1<T>, ...scopes): IOrderedODataQuery<T>;
     select<TResult = any>(selector: Func1<T, TResult>, ...scopes): IODataQuery<T>;
     expand<TNav>(navigationSelector: Func2<T, TNav>, selector?: Func2<TNav, any>, ...scopes): IODataQuery<T>;
     skip(count: number): IODataQuery<T>;

diff --git a/test/fixture.ts b/test/fixture.ts
@@ -38,6 +38,6 @@ export class CompanyService extends ODataService {
     }
 
     companies() {
-        return this.createQuery<Company>('Companies').expand(c => c.addresses.$expand(a => a.city).country);
+        return this.createQuery<Company>('Companies');
     }
 }
diff --git a/test/service.spec.ts b/test/service.spec.ts
@@ -28,6 +28,6 @@ describe('Service tests', () => {
 
         const prm = provider.options.params[0];
         expect(prm).property('key').to.equal('$orderby');
-        expect(prm).property('value').to.equal('id, name desc');
+        expect(prm).property('value').to.equal('id,name desc');
     });
 });