Merge branch 'release-5.21'

WISE-Community · Feb 11, 2021 · 3d45422 · 3d45422
2 parents 49b9d88 + 86e20f5
commit 3d45422
Show file tree

Hide file tree

Showing 76 changed files with 4,890 additions and 4,113 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wise",
-  "version": "5.20.5",
+  "version": "5.21.0",
   "description": "Web-based Inquiry Science Environment",
   "main": "app.js",
   "browserslist": [

diff --git a/pom.xml b/pom.xml
@@ -34,7 +34,7 @@
   <artifactId>wise</artifactId>
   <packaging>war</packaging>
   <name>Web-based Inquiry Science Environment</name>
-  <version>5.20.5</version>
+  <version>5.21.0</version>
   <url>http://wise5.org</url>
   <licenses>
     <license>

diff --git a/src/main/resources/version.txt b/src/main/resources/version.txt
@@ -1 +1 @@
-5.20.5
+5.21.0
diff --git a/src/main/webapp/site/src/app/services/discussionService.spec.ts b/src/main/webapp/site/src/app/services/discussionService.spec.ts
@@ -36,11 +36,6 @@ describe('DiscussionService', () => {
     service = TestBed.get(DiscussionService);
     configService = TestBed.get(ConfigService);
     studentDataService = TestBed.get(StudentDataService);
-    spyOn(service, 'getTranslation').and.callFake((key: string) => {
-      if (key === 'ENTER_PROMPT_HERE') {
-        return 'Enter prompt here';
-      }
-    });
   });
   createComponent();
   isCompleted();
@@ -92,7 +87,7 @@ function createComponent() {
   it('should create a discussion component', () => {
     const component = service.createComponent();
     expect(component.type).toEqual('Discussion');
-    expect(component.prompt).toEqual('Enter prompt here');
+    expect(component.prompt).toEqual('');
     expect(component.isStudentAttachmentEnabled).toEqual(true);
     expect(component.gateClassmateResponses).toEqual(true);
   });