Skip to content

Commit cb68711

Browse files
Michael BreuMichael Breu
authored andcommitted
fixing sharing jest tests
1 parent 8f6ada8 commit cb68711

File tree

4 files changed

+13
-14
lines changed

4 files changed

+13
-14
lines changed

src/main/webapp/app/programming/manage/detail/programming-exercise-detail.component.with-sharing.spec.ts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,13 @@ import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
2020
import { MockSyncStorage } from 'test/helpers/mocks/service/mock-sync-storage.service';
2121
import { LocalStorageService, SessionStorageService } from 'ngx-webstorage';
2222
import { MockProgrammingExerciseGradingService } from 'test/helpers/mocks/service/mock-programming-exercise-grading.service';
23-
import { TemplateProgrammingExerciseParticipation } from 'app/entities/participation/template-programming-exercise-participation.model';
24-
import { SolutionProgrammingExerciseParticipation } from 'app/entities/participation/solution-programming-exercise-participation.model';
23+
import { TemplateProgrammingExerciseParticipation } from 'app/exercise/shared/entities/participation/template-programming-exercise-participation.model';
24+
import { SolutionProgrammingExerciseParticipation } from 'app/exercise/shared/entities/participation/solution-programming-exercise-participation.model';
2525
import { HttpResponse, provideHttpClient } from '@angular/common/http';
26-
import { ProfileInfo } from 'app/shared/layouts/profiles/profile-info.model';
27-
import { ProgrammingLanguageFeature, ProgrammingLanguageFeatureService } from 'app/programming/shared/services/programming-language-feature/programming-language-feature.service';
26+
import { ProgrammingLanguageFeatureService } from 'app/programming/shared/services/programming-language-feature/programming-language-feature.service';
27+
import { ProfileInfo, ProgrammingLanguageFeature } from 'app/core/layouts/profiles/profile-info.model';
2828
import { MockRouter } from 'test/helpers/mocks/mock-router';
2929
import { ProgrammingExerciseGitDiffReport } from 'app/programming/shared/entities/programming-exercise-git-diff-report.model';
30-
import { BuildLogStatisticsDTO } from 'app/entities/programming/build-log-statistics-dto';
3130
import { SubmissionPolicyService } from 'app/programming/manage/services/submission-policy.service';
3231
import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing';
3332

src/main/webapp/app/sharing/sharing.component.spec.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
import { TranslateDirective } from 'app/shared/language/translate.directive';
2-
import { MockTranslateService, TranslatePipeMock } from '../../helpers/mocks/service/mock-translate.service';
3-
import { ProfileService } from 'app/shared/layouts/profiles/profile.service';
2+
import { MockTranslateService, TranslatePipeMock } from 'test/helpers/mocks/service/mock-translate.service';
3+
import { ProfileService } from 'app/core/layouts/profiles/shared/profile.service';
44
import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing';
55
import { ActivatedRoute, Router } from '@angular/router';
66
import { StaticContentService } from 'app/shared/service/static-content.service';
77
import { MockDirective, MockModule, MockProvider } from 'ng-mocks';
88
import { SharingComponent } from 'app/sharing/sharing.component';
9-
import { MockRouter } from '../../helpers/mocks/mock-router';
9+
import { MockRouter } from 'test/helpers/mocks/mock-router';
1010
import { ReactiveFormsModule } from '@angular/forms';
1111
import { TranslateService } from '@ngx-translate/core';
1212
import { SessionStorageService } from 'ngx-webstorage';
13-
import { MockSyncStorage } from '../../helpers/mocks/service/mock-sync-storage.service';
13+
import { MockSyncStorage } from 'test/helpers/mocks/service/mock-sync-storage.service';
1414
import { provideHttpClient } from '@angular/common/http';
1515
import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing';
1616
import { of } from 'rxjs';
1717
import { AccountService } from 'app/core/auth/account.service';
18-
import { Course } from 'app/entities/course.model';
18+
import { Course } from 'app/core/course/shared/entities/course.model';
1919
import { AlertService } from 'app/shared/service/alert.service';
20-
import { MockAlertService } from '../../helpers/mocks/service/mock-alert.service';
20+
import { MockAlertService } from 'test/helpers/mocks/service/mock-alert.service';
2121
import { SharingInfo, ShoppingBasket } from 'app/sharing/sharing.model';
22-
import { MockAccountService } from '../../helpers/mocks/service/mock-account.service';
22+
import { MockAccountService } from 'test/helpers/mocks/service/mock-account.service';
2323

2424
describe('SharingComponent', () => {
2525
let fixture: ComponentFixture<SharingComponent>;
@@ -65,7 +65,7 @@ describe('SharingComponent', () => {
6565
jest.restoreAllMocks();
6666
});
6767

68-
const testBasket: ShoppingBasket = { exerciseInfo: [], userInfo: {}, tokenValidUntil: new Date(Date.now() + 60 * 60 * 1000) };
68+
const testBasket: ShoppingBasket = { exerciseInfo: [], userInfo: { email: '[email protected]' }, tokenValidUntil: new Date(Date.now() + 60 * 60 * 1000) };
6969

7070
const courses: Course[] = [
7171
{ id: 1, title: 'testCouse 1' },

src/main/webapp/app/sharing/sharing.component.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,6 @@ export class SharingComponent implements OnInit {
173173
this.sharingInfo.basketToken = params['basketToken'];
174174
if (!this.sharingInfo.basketToken) {
175175
this.alertService.error('artemisApp.sharing.error.missingToken');
176-
return;
177176
}
178177
});
179178

src/test/javascript/spec/helpers/mocks/programming-exercise-creation-config-mock.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ export const programmingExerciseCreationConfigMock: ProgrammingExerciseCreationC
2222
isExamMode: false,
2323
isImportFromExistingExercise: false,
2424
isImportFromFile: false,
25+
isImportFromSharing: false,
2526
maxPenaltyPattern: '',
2627
modePickerOptions: [],
2728
onProgrammingLanguageChange(language: ProgrammingLanguage): ProgrammingLanguage {

0 commit comments

Comments
 (0)