From 89a734636bc5243476193ff1fa426a1009d6d5f4 Mon Sep 17 00:00:00 2001 From: Polina Shubina <925043@gmail.com> Date: Thu, 30 Aug 2018 18:20:42 +0300 Subject: [PATCH] Fixed ignores --- .../plugin/spec/CreateOrUpdateDatasource.groovy | 2 +- .../com/electriccloud/plugin/spec/DeleteDatasource.groovy | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/specs/src/test/groovy/com/electriccloud/plugin/spec/CreateOrUpdateDatasource.groovy b/specs/src/test/groovy/com/electriccloud/plugin/spec/CreateOrUpdateDatasource.groovy index 163aa4ef..593afbff 100644 --- a/specs/src/test/groovy/com/electriccloud/plugin/spec/CreateOrUpdateDatasource.groovy +++ b/specs/src/test/groovy/com/electriccloud/plugin/spec/CreateOrUpdateDatasource.groovy @@ -380,7 +380,7 @@ attachCredential projectName: '$projectName', def additionalOption @Unroll - @IgnoreIf({ isWebLogic11() && isWindows() }) + @IgnoreIf({ WebLogicHelper.isWebLogic11() && WebLogicHelper.isWindows() }) def 'CreateORUpdateDataSource - #caseId.ids #caseId.description, DS Name: #dataSourceName'() { setup: 'Define the parameters for Procedure running' Map runParams = [ diff --git a/specs/src/test/groovy/com/electriccloud/plugin/spec/DeleteDatasource.groovy b/specs/src/test/groovy/com/electriccloud/plugin/spec/DeleteDatasource.groovy index 1db5fd2a..b9fd65f1 100644 --- a/specs/src/test/groovy/com/electriccloud/plugin/spec/DeleteDatasource.groovy +++ b/specs/src/test/groovy/com/electriccloud/plugin/spec/DeleteDatasource.groovy @@ -219,7 +219,7 @@ class DeleteDatasource extends WebLogicHelper { @Unroll - @IgnoreIf({ isWebLogic11() && isWindows() }) + @IgnoreIf({ WebLogicHelper.isWebLogic11() && WebLogicHelper.isWindows() }) def "Delete DataSource #tcId - #tcDescription"(){ setup: "Create DataSource" (CONFIG_NAME, @@ -252,7 +252,7 @@ class DeleteDatasource extends WebLogicHelper { } @Unroll - @IgnoreIf({ isWebLogic11() && isWindows() }) + @IgnoreIf({ WebLogicHelper.isWebLogic11() && WebLogicHelper.isWindows() }) def "Delete DataSource #testCaseId - #testCaseDescription"(){ when: 'Delete Data source #dataSource ' @@ -271,7 +271,7 @@ class DeleteDatasource extends WebLogicHelper { @Unroll - @IgnoreIf({ isWebLogic11() && isWindows() }) + @IgnoreIf({ WebLogicHelper.isWebLogic11() && WebLogicHelper.isWindows() }) def "Delete DataSource #testCaseId - #tcDescription"(){ setup: "Create DataSource" (CONFIG_NAME, datasources.mysql,