GDB-6329 - update test controllers with license service

Ontotext-AD · Apr 30, 2024 · 74d03b6 · 74d03b6
1 parent b9e5ef1
commit 74d03b6
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 16 deletions.
diff --git a/src/js/angular/explore/controllers.js b/src/js/angular/explore/controllers.js
@@ -522,9 +522,9 @@ function FindResourceCtrl($scope, $http, $location, $repositories, $q, $timeout,
     }
 }
 
-EditResourceCtrl.$inject = ['$scope', '$http', '$location', 'toastr', '$repositories', '$uibModal', '$timeout', 'ClassInstanceDetailsService', 'StatementsService', 'RDF4JRepositoriesRestService', '$translate'];
+EditResourceCtrl.$inject = ['$scope', '$http', '$location', 'toastr', '$repositories', '$uibModal', '$timeout', 'ClassInstanceDetailsService', 'StatementsService', 'RDF4JRepositoriesRestService', '$translate', '$licenseService'];
 
-function EditResourceCtrl($scope, $http, $location, toastr, $repositories, $uibModal, $timeout, ClassInstanceDetailsService, StatementsService, RDF4JRepositoriesRestService, $translate) {
+function EditResourceCtrl($scope, $http, $location, toastr, $repositories, $uibModal, $timeout, ClassInstanceDetailsService, StatementsService, RDF4JRepositoriesRestService, $translate, $licenseService) {
     $scope.uriParam = $location.search().uri;
     $scope.newRow = {
         subject: $scope.uriParam,
@@ -548,9 +548,10 @@ function EditResourceCtrl($scope, $http, $location, toastr, $repositories, $uibM
     $scope.validEditRow = validEditRow;
     $scope.viewTrig = viewTrig;
     $scope.save = save;
+    $scope.isLicenseValid = $licenseService.isLicenseValid();
 
     function getClassInstancesDetails() {
-        if (!$scope.isLicenseValid()) {
+        if (!$scope.isLicenseValid) {
             return;
         }
         RDF4JRepositoriesRestService.getNamespaces($scope.activeRepository())

diff --git a/src/js/angular/graphexplore/controllers/dependencies-chord.controller.js b/src/js/angular/graphexplore/controllers/dependencies-chord.controller.js
@@ -48,9 +48,9 @@ function humanize(number) {
     return result + si[exp - 1];
 }
 
-DependenciesChordCtrl.$inject = ['$scope', '$rootScope', '$repositories', 'toastr', '$timeout', 'GraphDataRestService', 'UiScrollService', 'ModalService', 'LocalStorageAdapter', 'RDF4JRepositoriesRestService', '$translate'];
+DependenciesChordCtrl.$inject = ['$scope', '$rootScope', '$repositories', 'toastr', '$timeout', 'GraphDataRestService', 'UiScrollService', 'ModalService', 'LocalStorageAdapter', 'RDF4JRepositoriesRestService', '$translate', '$licenseService'];
 
-function DependenciesChordCtrl($scope, $rootScope, $repositories, toastr, $timeout, GraphDataRestService, UiScrollService, ModalService, LocalStorageAdapter, RDF4JRepositoriesRestService, $translate) {
+function DependenciesChordCtrl($scope, $rootScope, $repositories, toastr, $timeout, GraphDataRestService, UiScrollService, ModalService, LocalStorageAdapter, RDF4JRepositoriesRestService, $translate, $licenseService) {
 
     let timer = null;
 
@@ -212,7 +212,7 @@ function DependenciesChordCtrl($scope, $rootScope, $repositories, toastr, $timeo
     });
 
     $scope.$watch('direction', function () {
-        if (!$scope.isLicenseValid() || !$repositories.getActiveRepository() ||
+        if (!$licenseService.isLicenseValid() || !$repositories.getActiveRepository() ||
             $scope.isSystemRepository() || $repositories.isActiveRepoFedXType()) {
             return;
         }
@@ -297,7 +297,7 @@ function DependenciesChordCtrl($scope, $rootScope, $repositories, toastr, $timeo
     };
 
     function onRepositoryIsSet() {
-        if (!$scope.isLicenseValid()) {
+        if (!$licenseService.isLicenseValid()) {
             return;
         }
         // clear class search on changing the repository

diff --git a/src/js/angular/namespaces/controllers.js b/src/js/angular/namespaces/controllers.js
@@ -117,6 +117,7 @@ namespaces.controller('NamespacesCtrl', ['$scope', '$http', '$repositories', 'to
             $scope.searchNamespaces = '';
             $scope.getNamespaces();
             $scope.selectedAll = false;
+            $scope.isLicenseValid = $licenseService.isLicenseValid();
         });
 
         $scope.onNamespaceSearch = function() {

diff --git a/src/pages/namespaces.html b/src/pages/namespaces.html
@@ -16,7 +16,7 @@ <h1>
 <div class="ot-loader ot-main-loader" onto-loader size="50" ng-show="loader"></div>
 <div id="wb-namespaces" ng-hide="loader">
     <div core-errors license></div>
-    <div ng-show="getActiveRepository() && isLicenseValid()">
+    <div ng-show="getActiveRepository() && isLicenseValid">
         <div class="clearfix mb-2">
             <form novalidate name="form" class="form-inline pull-right add-namespace-form" ng-show="canWriteActiveRepo()">
                 <div class="form-group" style="width: 130px;">

diff --git a/test-cypress/integration/explore/similariti-index-create.spec.js b/test-cypress/integration/explore/similariti-index-create.spec.js
@@ -12,11 +12,10 @@ const DEFAULT_PREDICATION_SELECT_QUERY = 'SELECT ?subject ?predicate ?object\nWH
 const DEFAULT_PREDICATION_SEARCH_QUERY = 'SELECT ?entity ?score {\n ?search a ?index ;\n ?searchType ?query;\n psi:searchPredicate ?psiPredicate;\n :searchParameters ?parameters;\n ?resultType ?result .\n ?result :value ?entity ;\n :score ?score .\n}';
 
 describe('Create similarity index', () => {
-    let secondRepositoryId;
     let repositoryId;
 
     beforeEach(() => {
-        const repositoryId = 'similarity-index-create' + Date.now();
+        repositoryId = 'similarity-index-create' + Date.now();
         cy.createRepository({id: repositoryId});
         cy.presetRepository(repositoryId);
         cy.importServerFile(repositoryId, FILE_TO_IMPORT);
@@ -25,7 +24,6 @@ describe('Create similarity index', () => {
 
     afterEach(() => {
         cy.deleteRepository(repositoryId);
-        cy.deleteRepository(secondRepositoryId);
     });
 
     context('Validations for textual similarity index', () => {

diff --git a/test/namespaces/controllers.spec.js b/test/namespaces/controllers.spec.js
@@ -23,9 +23,10 @@ describe('=> NamespacesCtrl tests', function () {
         toastr,
         httpGetNamespaces,
         modalInstance,
-        $translate;
+        $translate,
+        $licenseService;
 
-    beforeEach(angular.mock.inject(function (_$httpBackend_, _$repositories_, _RDF4JRepositoriesRestService_, _toastr_, _$location_, _$controller_, _$window_, _$timeout_, $rootScope, $q, _$translate_) {
+    beforeEach(angular.mock.inject(function (_$httpBackend_, _$repositories_, _RDF4JRepositoriesRestService_, _toastr_, _$location_, _$controller_, _$window_, _$timeout_, $rootScope, $q, _$translate_, _$licenseService_) {
         $httpBackend = _$httpBackend_;
         $controller = _$controller_;
         $timeout = _$timeout_;
@@ -34,13 +35,18 @@ describe('=> NamespacesCtrl tests', function () {
         toastr = _toastr_;
         $scope = $rootScope.$new();
         $translate = _$translate_;
+        $licenseService = _$licenseService_;
 
         $translate.instant = function (key) {
             return bundle[key];
         };
 
         modalInstance = new FakeModal($q, $rootScope);
-
+        $licenseService.isLicenseValid = function () {
+            return true;
+        }
+        $httpBackend.when('GET', 'rest/graphdb-settings/license').respond(200, 'licenseinfo');
+        $httpBackend.when('GET', 'rest/graphdb-settings/license/hardcoded').respond(200, 'true');
         $httpBackend.when('GET', 'rest/locations').respond(200, {});
 
         $repositories.getActiveRepositoryObject = function () {
@@ -100,7 +106,8 @@ describe('=> NamespacesCtrl tests', function () {
                     return modalInstance;
                 }
             },
-            $translate: $translate
+            $translate: $translate,
+            $licenseService: $licenseService
         });
     }));
 

diff --git a/test/resource/controllers.spec.js b/test/resource/controllers.spec.js
@@ -21,8 +21,11 @@ describe('=> EditResourceCtrl', function () {
         StatementsService,
         $scope,
         $translate;
+        $licenseService;
 
-    beforeEach(angular.mock.inject(function (_$repositories_, _$httpBackend_, _$location_, _$controller_, _$window_, _$timeout_, _ClassInstanceDetailsService_, _StatementsService_, $rootScope, _$translate_) {
+    beforeEach(angular.mock.inject(function (_$repositories_, _$httpBackend_, _$location_, _$controller_, _$window_,
+                                             _$timeout_, _ClassInstanceDetailsService_, _StatementsService_, $rootScope,
+                                             _$translate_, _$licenseService_) {
         $repositories = _$repositories_;
         $httpBackend = _$httpBackend_;
         $location = _$location_;
@@ -33,12 +36,15 @@ describe('=> EditResourceCtrl', function () {
         StatementsService = _StatementsService_;
         $scope = $rootScope.$new();
         $translate = _$translate_;
+        $licenseService = _$licenseService_;
 
         $translate.instant = function (key) {
             return bundle[key];
         }
 
         $httpBackend.when('GET', 'rest/locations').respond(200, {});
+        $httpBackend.when('GET', 'rest/graphdb-settings/license').respond(200, 'licenseinfo');
+        $httpBackend.when('GET', 'rest/graphdb-settings/license/hardcoded').respond(200, 'true');
 
         $controller('EditResourceCtrl', {$scope: $scope, $translate: $translate});