Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
stritti committed Sep 18, 2017
2 parents f95ef21 + 2a26f77 commit 289b9de
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions src/itest/java/com/sybit/airtable/mock/WireMockBaseTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,17 @@
/**
* Base Class to test using WireMock.
*
* Config files for the requests are stored at
* 'src/test/resources/__files' and 'src/test/resources/mappings'.
* Config files for the requests are stored at 'src/test/resources/__files' and
* 'src/test/resources/mappings'.
*/
public class WireMockBaseTest {

private static WireMockServer wireMockServer;
private static WiremockProp prop;

protected static Airtable airtable = new Airtable();
protected static Base base;

private class WiremockProp {

private boolean recording;
Expand Down Expand Up @@ -128,20 +134,15 @@ public void setServerPort(int aServerPort) {
}
};

private static WireMockServer wireMockServer;
private static WiremockProp prop;

protected static Airtable airtable = new Airtable();
protected static Base base;

@Before
public void setUp() throws AirtableException {

airtable.configure();
airtable.setProxy("127.0.0.1");
airtable.setEndpointUrl("http://localhost:8080");
base = airtable.base("appTtHA5PfJnVfjdu");


prop = new WiremockProp();
prop.setRecording(false);
prop.setCleanDirectorys(false);
prop.setProxyBase("192.168.1.254");
Expand Down Expand Up @@ -223,4 +224,3 @@ public static void cleanExistingRecords() {
}

}

0 comments on commit 289b9de

Please sign in to comment.