Skip to content

Commit

Permalink
fix: allow the mock server port to be configured
Browse files Browse the repository at this point in the history
  • Loading branch information
Ronald Holshausen committed Sep 29, 2020
1 parent a28a64f commit 9c63d28
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 5 deletions.
9 changes: 8 additions & 1 deletion native/src/lib.rs
Expand Up @@ -702,12 +702,19 @@ declare_types! {
},
_ => MockServerConfig::default()
};
let mock_server_port = match options.get(&mut cx, "port") {
Ok(prop) => match prop.downcast::<JsNumber>() {
Ok(port) => port.value() as u16,
_ => 0
},
_ => 0
};
let mock_server_id = Uuid::new_v4().simple().to_string();
let port = {
let guard = cx.lock();
let pact = this.borrow(&guard);
match MANAGER.lock().unwrap()
.start_mock_server(mock_server_id.clone(), pact.clone(), 0, mock_server_config)
.start_mock_server(mock_server_id.clone(), pact.clone(), mock_server_port, mock_server_config)
.map(|port| port as i32) {
Ok(port) => port,
Err(err) => panic!(err)
Expand Down
11 changes: 7 additions & 4 deletions src/v3/pact.ts
@@ -1,4 +1,3 @@
import logger from "../common/logger"
import { omit } from "ramda"
const pkg = require("../common/metadata")
const PactNative = require("../native")
Expand All @@ -20,9 +19,13 @@ export interface PactV3Options {
*/
provider: string,
/**
* If the mock server should have CORS pre-flight requests
* If the mock server should have CORS pre-flight requests. Defaults to false
*/
cors?: boolean
cors?: boolean,
/**
* Port to run the mock server on. Defaults to a random port
*/
port?: number
}

export interface V3ProviderState {
Expand Down Expand Up @@ -63,7 +66,7 @@ export class PactV3 {

constructor(opts: PactV3Options & {}) {
this.opts = opts
this.pact = new PactNative.Pact(opts.consumer, opts.provider, pkg.version, omit(['consumer', 'provider'], opts))
this.pact = new PactNative.Pact(opts.consumer, opts.provider, pkg.version, omit(['consumer', 'provider', 'dir'], opts))
}

public given(providerState: string, parameters?: any): PactV3 {
Expand Down

0 comments on commit 9c63d28

Please sign in to comment.