feat(expression-languages): set FEEL as default expression language

Related to camunda/camunda-modeler#1710
bpmn-io · Mar 18, 2020 · ed256c2 · ed256c2
1 parent 79acba9
commit ed256c2
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/packages/dmn-js-decision-table/test/spec/expression-language.dmn b/packages/dmn-js-decision-table/test/spec/expression-language.dmn
@@ -32,7 +32,7 @@
         <outputEntry id="outputEntry1" expressionLanguage="javascript">
           <text>"notok"</text>
         </outputEntry>
-        <outputEntry id="outputEntry2" expressionLanguage="juel">
+        <outputEntry id="outputEntry2" expressionLanguage="feel">
           <text>"work on your status first, as bronze you're not going to get anything"</text>
         </outputEntry>
       </rule>

diff --git a/...decision-table/test/spec/features/decision-table-head/editor/input/InputEditorCellSpec.js b/...decision-table/test/spec/features/decision-table-head/editor/input/InputEditorCellSpec.js
@@ -111,7 +111,7 @@ describe('decision-table-head/editor - input', function() {
 
       // then
       expect(inputBo.inputExpression.text).to.equal('foo\nbar');
-      expect(inputBo.inputExpression.expressionLanguage).to.equal('juel');
+      expect(inputBo.inputExpression.expressionLanguage).to.equal('feel');
     }));
 
 
@@ -126,7 +126,7 @@ describe('decision-table-head/editor - input', function() {
       triggerClick(makeScriptEl);
 
       // then
-      expect(inputBo.inputExpression.expressionLanguage).to.equal('juel');
+      expect(inputBo.inputExpression.expressionLanguage).to.equal('feel');
     }));
 
   });

diff --git a/packages/dmn-js-shared/src/features/expression-languages/ExpressionLanguages.js b/packages/dmn-js-shared/src/features/expression-languages/ExpressionLanguages.js
@@ -60,8 +60,7 @@ export default class ExpressionLanguages {
     this._config = {
       options: EXPRESSION_LANGUAGE_OPTIONS,
       defaults: {
-        editor: 'juel',
-        inputCell: 'feel'
+        editor: 'feel'
       }
     };
 

diff --git a/packages/dmn-js-shared/test/spec/features/expression-languages/ExpressionLanguagesSpec.js b/packages/dmn-js-shared/test/spec/features/expression-languages/ExpressionLanguagesSpec.js
@@ -28,7 +28,7 @@ describe('ExpressionLanguages', function() {
 
   describe('defaults', () => {
 
-    it('should set default editor expression language to JUEL', () => {
+    it('should set default editor expression language to FEEL', () => {
 
       // given
       const expressionLanguages = createExpressionLanguages();
@@ -38,8 +38,8 @@ describe('ExpressionLanguages', function() {
 
       // then
       expect(defaultLanguage).to.eql({
-        value: 'juel',
-        label: 'JUEL'
+        value: 'feel',
+        label: 'FEEL'
       });
     });