Main build (Jenkins)

.github/workflows/oint_test_full_en.yml

@@ -1210,7 +1210,7 @@ jobs:
           path: ./docs/en/results/CDEK
 
 
-  Testing-YandexMarket:
+  Testing-YandexMetrika:
     runs-on: ubuntu-latest
     needs: [Decode, Build]
     steps:
@@ -1240,24 +1240,20 @@ jobs:
 
 
 
-      - name: Campaigns and business
+      - name: Tags managment
         if: ${{ cancelled() }} == false
-        run: oscript /home/runner/.local/share/ovm/current/lib/1testrunner/src/main.os -run ./src/en/OInt/tests/Modules/internal/OPI_TestsCLI.os "CLI_YaMarket_CampaignsAndBusiness"
+        run: oscript /home/runner/.local/share/ovm/current/lib/1testrunner/src/main.os -run ./src/en/OInt/tests/Modules/internal/OPI_TestsCLI.os "CLI_YaMetrika_TagsManagment"
-
-      - name: Products managment
-        if: ${{ cancelled() }} == false
-        run: oscript /home/runner/.local/share/ovm/current/lib/1testrunner/src/main.os -run ./src/en/OInt/tests/Modules/internal/OPI_TestsCLI.os "CLI_YaMarket_ProductsManagment"
 
       - name: Записать логи
         if: ${{ cancelled() }} == false
         uses: actions/cache/save@v3
         with:
-          key: logs-YandexMarket
+          key: logs-YandexMetrika
-          path: ./docs/en/results/YandexMarket
+          path: ./docs/en/results/YandexMetrika
 
   Encode:
     runs-on: ubuntu-latest
-    needs: [Testing-Telegram,Testing-VK,Testing-Viber,Testing-Twitter,Testing-YandexDisk,Testing-GoogleWorkspace,Testing-GoogleCalendar,Testing-GoogleDrive,Testing-GoogleSheets,Testing-Notion,Testing-Slack,Testing-Airtable,Testing-Dropbox,Testing-Bitrix24,Testing-VkTeams,Testing-Ozon,Testing-Neocities,Testing-CDEK,Testing-YandexMarket]
+    needs: [Testing-Telegram,Testing-VK,Testing-Viber,Testing-Twitter,Testing-YandexDisk,Testing-GoogleWorkspace,Testing-GoogleCalendar,Testing-GoogleDrive,Testing-GoogleSheets,Testing-Notion,Testing-Slack,Testing-Airtable,Testing-Dropbox,Testing-Bitrix24,Testing-VkTeams,Testing-Ozon,Testing-Neocities,Testing-CDEK,Testing-YandexMetrika]
     if: ${{ always() }}
     permissions:
       contents: write
@@ -1573,21 +1569,21 @@ jobs:
           -H "X-GitHub-Api-Version: 2022-11-28" \
           "https://api.github.com/repos/Bayselonarrend/OpenIntegrations/actions/caches?key=logs-CDEK"
 
-      - name: Получить логи YandexMarket
+      - name: Получить логи YandexMetrika
         uses: actions/cache/restore@v3
         with:
-          key: logs-YandexMarket
+          key: logs-YandexMetrika
-          path: ./docs/en/results/YandexMarket
+          path: ./docs/en/results/YandexMetrika
 
 
-      - name: Очистка логов YandexMarket
+      - name: Очистка логов YandexMetrika
         run: |
           curl -L \
           -X DELETE \
           -H "Accept: application/vnd.github+json" \
           -H "Authorization: Bearer ${{ secrets.TOKEN }}" \
           -H "X-GitHub-Api-Version: 2022-11-28" \
-          "https://api.github.com/repos/Bayselonarrend/OpenIntegrations/actions/caches?key=logs-YandexMarket"
+          "https://api.github.com/repos/Bayselonarrend/OpenIntegrations/actions/caches?key=logs-YandexMetrika"
 
 
       - name: Записать данные    
@@ -1601,7 +1597,7 @@ jobs:
 
   Clear-Cache:
     runs-on: ubuntu-latest
-    needs: [Testing-Telegram, Testing-VK, Testing-Viber, Testing-Twitter, Testing-YandexDisk, Testing-GoogleWorkspace, Testing-GoogleCalendar, Testing-GoogleDrive, Testing-GoogleSheets, Testing-Notion, Testing-Slack, Testing-Airtable, Testing-Dropbox, Testing-Bitrix24, Testing-VkTeams, Testing-Ozon, Testing-Neocities, Testing-CDEK, Testing-YandexMarket, Encode]
+    needs: [Testing-Telegram, Testing-VK, Testing-Viber, Testing-Twitter, Testing-YandexDisk, Testing-GoogleWorkspace, Testing-GoogleCalendar, Testing-GoogleDrive, Testing-GoogleSheets, Testing-Notion, Testing-Slack, Testing-Airtable, Testing-Dropbox, Testing-Bitrix24, Testing-VkTeams, Testing-Ozon, Testing-Neocities, Testing-CDEK, Testing-YandexMetrika, Encode]
     if: ${{ always() }}
     steps:
       - name: Очистка основного кэша

.github/workflows/oint_test_full_ru.yml

@@ -1210,52 +1210,6 @@ jobs:
           path: ./docs/ru/results/CDEK
 
 
-  Testing-YandexMarket:
-    runs-on: ubuntu-latest
-    needs: [Decode, Build]
-    steps:
-
-      - uses: actions/checkout@v2 
-      - uses: otymko/setup-onescript@v1.4
-        with:
-          version: 1.9.1
-      
-      - name: Получить тестовые данные из кэша
-        uses: actions/cache/restore@v3
-        with:
-          key: test-data
-          path: ./data.json
-      
-      - name: Установить asserts и 1testrunner
-        run: |
-          opm install asserts
-          opm install 1testrunner
-
-      - name: Установить OInt
-        run: |
-          TEMP_DEB="$(mktemp)" &&
-          wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.15.1/oint_1.15.1_all_ru.deb' &&
-          sudo dpkg -i "$TEMP_DEB"
-          rm -f "$TEMP_DEB"
-
-
-
-      - name: Кабинеты и магазины
-        if: ${{ cancelled() }} == false
-        run: oscript /home/runner/.local/share/ovm/current/lib/1testrunner/src/main.os -run ./src/ru/OInt/tests/Modules/internal/OPI_ТестыCLI.os "CLI_ЯМаркет_КабинетыИМагазины"
-
-      - name: Работа с товарами
-        if: ${{ cancelled() }} == false
-        run: oscript /home/runner/.local/share/ovm/current/lib/1testrunner/src/main.os -run ./src/ru/OInt/tests/Modules/internal/OPI_ТестыCLI.os "CLI_ЯМаркет_РаботаСТоварами"
-
-      - name: Записать логи
-        if: ${{ cancelled() }} == false
-        uses: actions/cache/save@v3
-        with:
-          key: logs-YandexMarket
-          path: ./docs/ru/results/YandexMarket
-
-
   Testing-YandexMetrika:
     runs-on: ubuntu-latest
     needs: [Decode, Build]
@@ -1299,7 +1253,7 @@ jobs:
 
   Encode:
     runs-on: ubuntu-latest
-    needs: [Testing-Telegram,Testing-VK,Testing-Viber,Testing-Twitter,Testing-YandexDisk,Testing-GoogleWorkspace,Testing-GoogleCalendar,Testing-GoogleDrive,Testing-GoogleSheets,Testing-Notion,Testing-Slack,Testing-Airtable,Testing-Dropbox,Testing-Bitrix24,Testing-VkTeams,Testing-Ozon,Testing-Neocities,Testing-CDEK,Testing-YandexMarket,Testing-YandexMetrika]
+    needs: [Testing-Telegram,Testing-VK,Testing-Viber,Testing-Twitter,Testing-YandexDisk,Testing-GoogleWorkspace,Testing-GoogleCalendar,Testing-GoogleDrive,Testing-GoogleSheets,Testing-Notion,Testing-Slack,Testing-Airtable,Testing-Dropbox,Testing-Bitrix24,Testing-VkTeams,Testing-Ozon,Testing-Neocities,Testing-CDEK,Testing-YandexMetrika]
     if: ${{ always() }}
     permissions:
       contents: write
@@ -1615,22 +1569,6 @@ jobs:
           -H "X-GitHub-Api-Version: 2022-11-28" \
           "https://api.github.com/repos/Bayselonarrend/OpenIntegrations/actions/caches?key=logs-CDEK"
 
-      - name: Получить логи YandexMarket
-        uses: actions/cache/restore@v3
-        with:
-          key: logs-YandexMarket
-          path: ./docs/ru/results/YandexMarket
-
-
-      - name: Очистка логов YandexMarket
-        run: |
-          curl -L \
-          -X DELETE \
-          -H "Accept: application/vnd.github+json" \
-          -H "Authorization: Bearer ${{ secrets.TOKEN }}" \
-          -H "X-GitHub-Api-Version: 2022-11-28" \
-          "https://api.github.com/repos/Bayselonarrend/OpenIntegrations/actions/caches?key=logs-YandexMarket"
-
       - name: Получить логи YandexMetrika
         uses: actions/cache/restore@v3
         with:
@@ -1659,7 +1597,7 @@ jobs:
 
   Clear-Cache:
     runs-on: ubuntu-latest
-    needs: [Testing-Telegram, Testing-VK, Testing-Viber, Testing-Twitter, Testing-YandexDisk, Testing-GoogleWorkspace, Testing-GoogleCalendar, Testing-GoogleDrive, Testing-GoogleSheets, Testing-Notion, Testing-Slack, Testing-Airtable, Testing-Dropbox, Testing-Bitrix24, Testing-VkTeams, Testing-Ozon, Testing-Neocities, Testing-CDEK, Testing-YandexMarket, Testing-YandexMetrika, Encode]
+    needs: [Testing-Telegram, Testing-VK, Testing-Viber, Testing-Twitter, Testing-YandexDisk, Testing-GoogleWorkspace, Testing-GoogleCalendar, Testing-GoogleDrive, Testing-GoogleSheets, Testing-Notion, Testing-Slack, Testing-Airtable, Testing-Dropbox, Testing-Bitrix24, Testing-VkTeams, Testing-Ozon, Testing-Neocities, Testing-CDEK, Testing-YandexMetrika, Encode]
     if: ${{ always() }}
     steps:
       - name: Очистка основного кэша

ci/cli_ostesten

@@ -622,16 +622,12 @@ pipeline {
 			}
 		}
 
-        stage('Testing-YandexMarket') {
+        stage('Testing-YandexMetrika') {
 			steps {
 					
 
                catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {   
-					powershell encoding: 'UTF-8', script:'1testrunner -run "./src/en/OInt/tests/Modules/internal/OPI_TestsCLI.os" "CLI_YaMarket_CampaignsAndBusiness"'
+					powershell encoding: 'UTF-8', script:'1testrunner -run "./src/en/OInt/tests/Modules/internal/OPI_TestsCLI.os" "CLI_YaMetrika_TagsManagment"'
-               }
-
-               catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {   
-					powershell encoding: 'UTF-8', script:'1testrunner -run "./src/en/OInt/tests/Modules/internal/OPI_TestsCLI.os" "CLI_YaMarket_ProductsManagment"'
                }
 
 			}

ci/cli_ostestru

@@ -622,21 +622,6 @@ pipeline {
 			}
 		}
 
-        stage('Testing-YandexMarket') {
-			steps {
-					
-
-               catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {   
-					powershell encoding: 'UTF-8', script:'1testrunner -run "./src/ru/OInt/tests/Modules/internal/OPI_ТестыCLI.os" "CLI_ЯМаркет_КабинетыИМагазины"'
-               }
-
-               catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {   
-					powershell encoding: 'UTF-8', script:'1testrunner -run "./src/ru/OInt/tests/Modules/internal/OPI_ТестыCLI.os" "CLI_ЯМаркет_РаботаСТоварами"'
-               }
-
-			}
-		}
-
         stage('Testing-YandexMetrika') {
 			steps {
 					

ci/ostesten

@@ -622,16 +622,12 @@ pipeline {
 			}
 		}
 
-        stage('Testing-YandexMarket') {
+        stage('Testing-YandexMetrika') {
 			steps {
 					
 
                catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {   
-					powershell encoding: 'UTF-8', script:'1testrunner -run "./src/en/OInt/tests/Modules/internal/OPI_Tests.os" "YaMarket_CampaignsAndBusiness"'
+					powershell encoding: 'UTF-8', script:'1testrunner -run "./src/en/OInt/tests/Modules/internal/OPI_Tests.os" "YaMetrika_TagsManagment"'
-               }
-
-               catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {   
-					powershell encoding: 'UTF-8', script:'1testrunner -run "./src/en/OInt/tests/Modules/internal/OPI_Tests.os" "YaMarket_ProductsManagment"'
                }
 
 			}

ci/ostestru

@@ -622,21 +622,6 @@ pipeline {
 			}
 		}
 
-        stage('Testing-YandexMarket') {
-			steps {
-					
-
-               catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {   
-					powershell encoding: 'UTF-8', script:'1testrunner -run "./src/ru/OInt/tests/Modules/internal/OPI_Тесты.os" "ЯМаркет_КабинетыИМагазины"'
-               }
-
-               catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {   
-					powershell encoding: 'UTF-8', script:'1testrunner -run "./src/ru/OInt/tests/Modules/internal/OPI_Тесты.os" "ЯМаркет_РаботаСТоварами"'
-               }
-
-			}
-		}
-
         stage('Testing-YandexMetrika') {
 			steps {
 					

src/en/OInt/core/Modules/OPI_YandexMarket.os

@@ -218,7 +218,7 @@ Function GetCampaignProducts(Val Token, Val CampaignID, Val Filters = "", Val Pa
         OPI_TypeConversion.GetCollection(Filters);
         Response = OPI_Tools.Post(URL, Filters, Headers);
     Else
-        Response    = OPI_Tools.Post(URL, , Headers);
+        Response = OPI_Tools.Post(URL,        , Headers);
     EndIf;
 
     Return Response;
@@ -242,7 +242,7 @@ Function GetBusinessProducts(Val Token, Val AccountID, Val Filters = "", Val Pag
         OPI_TypeConversion.GetCollection(Filters);
         Response = OPI_Tools.Post(URL, Filters, Headers);
     Else
-        Response    = OPI_Tools.Post(URL, , Headers);
+        Response = OPI_Tools.Post(URL,        , Headers);
     EndIf;
 
     Return Response;

src/en/OPI/src/CommonModules/OPI_YandexMarket/Module.bsl

@@ -218,7 +218,7 @@ Function GetCampaignProducts(Val Token, Val CampaignID, Val Filters = "", Val Pa
         OPI_TypeConversion.GetCollection(Filters);
         Response = OPI_Tools.Post(URL, Filters, Headers);
     Else
-        Response    = OPI_Tools.Post(URL, , Headers);
+        Response = OPI_Tools.Post(URL,        , Headers);
     EndIf;
 
     Return Response;
@@ -242,7 +242,7 @@ Function GetBusinessProducts(Val Token, Val AccountID, Val Filters = "", Val Pag
         OPI_TypeConversion.GetCollection(Filters);
         Response = OPI_Tools.Post(URL, Filters, Headers);
     Else
-        Response    = OPI_Tools.Post(URL, , Headers);
+        Response = OPI_Tools.Post(URL,        , Headers);
     EndIf;
 
     Return Response;

src/ru/OInt/core/Modules/OPI_YandexMarket.os

@@ -216,9 +216,9 @@
 
     Если ЗначениеЗаполнено(Фильтры) Тогда
         OPI_ПреобразованиеТипов.ПолучитьКоллекцию(Фильтры);
-        Ответ = OPI_Инструменты.Post(URL, Фильтры, Заголовки);
+        Ответ    = OPI_Инструменты.Post(URL, Фильтры, Заголовки);
     Иначе
-        Ответ    = OPI_Инструменты.Post(URL, , Заголовки);
+        Ответ    = OPI_Инструменты.Post(URL,        , Заголовки);
     КонецЕсли;
 
     Возврат Ответ;
@@ -240,9 +240,9 @@
 
     Если ЗначениеЗаполнено(Фильтры) Тогда
         OPI_ПреобразованиеТипов.ПолучитьКоллекцию(Фильтры);
-        Ответ = OPI_Инструменты.Post(URL, Фильтры, Заголовки);
+        Ответ    = OPI_Инструменты.Post(URL, Фильтры, Заголовки);
     Иначе
-        Ответ    = OPI_Инструменты.Post(URL, , Заголовки);
+        Ответ    = OPI_Инструменты.Post(URL,        , Заголовки);
     КонецЕсли;
 
     Возврат Ответ;

src/ru/OPI/src/CommonModules/OPI_YandexMarket/Module.bsl

@@ -216,9 +216,9 @@
 
     Если ЗначениеЗаполнено(Фильтры) Тогда
         OPI_ПреобразованиеТипов.ПолучитьКоллекцию(Фильтры);
-        Ответ = OPI_Инструменты.Post(URL, Фильтры, Заголовки);
+        Ответ    = OPI_Инструменты.Post(URL, Фильтры, Заголовки);
     Иначе
-        Ответ    = OPI_Инструменты.Post(URL, , Заголовки);
+        Ответ    = OPI_Инструменты.Post(URL,        , Заголовки);
     КонецЕсли;
 
     Возврат Ответ;
@@ -240,9 +240,9 @@
 
     Если ЗначениеЗаполнено(Фильтры) Тогда
         OPI_ПреобразованиеТипов.ПолучитьКоллекцию(Фильтры);
-        Ответ = OPI_Инструменты.Post(URL, Фильтры, Заголовки);
+        Ответ    = OPI_Инструменты.Post(URL, Фильтры, Заголовки);
     Иначе
-        Ответ    = OPI_Инструменты.Post(URL, , Заголовки);
+        Ответ    = OPI_Инструменты.Post(URL,        , Заголовки);
     КонецЕсли;
 
     Возврат Ответ;