couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gar...@apache.org
Subject fauxton commit: updated refs/heads/master to 5d1cb43
Date Wed, 03 Jun 2015 07:22:28 GMT
Repository: couchdb-fauxton
Updated Branches:
  refs/heads/master 79c20e43b -> 5d1cb4378


Fix code editor test name


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/5d1cb437
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/5d1cb437
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/5d1cb437

Branch: refs/heads/master
Commit: 5d1cb4378a79912eb210c45f1e03142bbb953700
Parents: 79c20e4
Author: Garren Smith <garren.smith@gmail.com>
Authored: Wed Jun 3 09:16:51 2015 +0200
Committer: Garren Smith <garren.smith@gmail.com>
Committed: Wed Jun 3 09:21:51 2015 +0200

----------------------------------------------------------------------
 app/addons/components/tests/codeEditorSpec.jsx  | 134 -------------------
 .../components/tests/codeEditorSpec.react.jsx   | 134 +++++++++++++++++++
 2 files changed, 134 insertions(+), 134 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/5d1cb437/app/addons/components/tests/codeEditorSpec.jsx
----------------------------------------------------------------------
diff --git a/app/addons/components/tests/codeEditorSpec.jsx b/app/addons/components/tests/codeEditorSpec.jsx
deleted file mode 100644
index 73f9ce1..0000000
--- a/app/addons/components/tests/codeEditorSpec.jsx
+++ /dev/null
@@ -1,134 +0,0 @@
-// Licensed under the Apache License, Version 2.0 (the "License"); you may not
-// use this file except in compliance with the License. You may obtain a copy of
-// the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-// License for the specific language governing permissions and limitations under
-// the License.
-define([
-  'api',
-  'addons/components/react-components.react',
-
-  'testUtils',
-  'react'
-], function (FauxtonAPI, ReactComponents, utils, React) {
-
-  var assert = utils.assert;
-  var TestUtils = React.addons.TestUtils;
-  var code = 'function (doc) {\n  emit(doc._id, 1);\n}';
-  var code2 = 'function (doc) {\n if(doc._id) { \n emit(doc._id, 2); \n } \n}';
-
-  describe('Code Editor', function () {
-    var container, codeEditorEl, spy;
-
-    beforeEach(function () {
-      spy = sinon.spy();
-      container = document.createElement('div');
-      codeEditorEl = TestUtils.renderIntoDocument(
-        <ReactComponents.CodeEditor code={code} change={spy} />,
-        container
-      );
-    });
-
-    afterEach(function () {
-      React.unmountComponentAtNode(container);
-    });
-
-    describe('Tracking edits', function () {
-
-      it('no change on mount', function () {
-        assert.notOk(codeEditorEl.hasChanged());
-      });
-
-      it('detects change on user input', function () {
-        codeEditorEl.editor.setValue(code2, -1);
-
-        assert.ok(codeEditorEl.hasChanged());
-      });
-
-    });
-
-    describe('onBlur', function () {
-
-      it('calls changed function', function () {
-        codeEditorEl.editor._emit('blur');
-        assert.ok(spy.calledOnce);
-      });
-
-    });
-
-    describe('setHeightToLineCount', function () {
-
-      beforeEach(function () {
-        codeEditorEl = TestUtils.renderIntoDocument(
-          <ReactComponents.CodeEditor code={code} isFullPageEditor={false}  setHeightWithJS={true}/>,
-          container
-        );
-
-      });
-
-      it('sets line height correctly for non full page', function () {
-        var spy = sinon.spy(codeEditorEl.editor, 'setOptions');
-
-        codeEditorEl.setHeightToLineCount();
-        assert.ok(spy.calledOnce);
-        assert.equal(spy.getCall(0).args[0].maxLines, 3);
-      });
-
-    });
-
-    describe('removeIncorrectAnnotations', function () {
-
-      beforeEach(function () {
-        codeEditorEl = TestUtils.renderIntoDocument(
-          <ReactComponents.CodeEditor code={code}/>,
-          container
-        );
-
-      });
-
-      it('removes default errors that do not apply to CouchDB Views', function () {
-        assert.equal(codeEditorEl.getAnnotations(), 0);
-      });
-
-    });
-
-    describe('setEditorValue', function () {
-
-      it('sets new code', function () {
-        codeEditorEl = TestUtils.renderIntoDocument(
-          <ReactComponents.CodeEditor code={code}/>,
-          container
-        );
-
-        codeEditorEl.setEditorValue(code2);
-        assert.deepEqual(codeEditorEl.getValue(), code2);
-      });
-
-    });
-
-    describe('showEditorOnly', function () {
-
-      it('only shows editor when showEditorOnly=true', function () {
-        codeEditorEl = TestUtils.renderIntoDocument(
-          <ReactComponents.CodeEditor code={code} showEditorOnly={true} />,
-          container
-        );
-        assert.notOk($(codeEditorEl.getDOMNode()).hasClass('control-group'));
-      });
-
-      it('shows everything by default', function () {
-        var codeEditorEl = TestUtils.renderIntoDocument(
-          <ReactComponents.CodeEditor code={code} />,
-          container
-        );
-        assert.ok($(codeEditorEl.getDOMNode()).hasClass('control-group'));
-      });
-
-    });
-  });
-});

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/5d1cb437/app/addons/components/tests/codeEditorSpec.react.jsx
----------------------------------------------------------------------
diff --git a/app/addons/components/tests/codeEditorSpec.react.jsx b/app/addons/components/tests/codeEditorSpec.react.jsx
new file mode 100644
index 0000000..73f9ce1
--- /dev/null
+++ b/app/addons/components/tests/codeEditorSpec.react.jsx
@@ -0,0 +1,134 @@
+// Licensed under the Apache License, Version 2.0 (the "License"); you may not
+// use this file except in compliance with the License. You may obtain a copy of
+// the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+// License for the specific language governing permissions and limitations under
+// the License.
+define([
+  'api',
+  'addons/components/react-components.react',
+
+  'testUtils',
+  'react'
+], function (FauxtonAPI, ReactComponents, utils, React) {
+
+  var assert = utils.assert;
+  var TestUtils = React.addons.TestUtils;
+  var code = 'function (doc) {\n  emit(doc._id, 1);\n}';
+  var code2 = 'function (doc) {\n if(doc._id) { \n emit(doc._id, 2); \n } \n}';
+
+  describe('Code Editor', function () {
+    var container, codeEditorEl, spy;
+
+    beforeEach(function () {
+      spy = sinon.spy();
+      container = document.createElement('div');
+      codeEditorEl = TestUtils.renderIntoDocument(
+        <ReactComponents.CodeEditor code={code} change={spy} />,
+        container
+      );
+    });
+
+    afterEach(function () {
+      React.unmountComponentAtNode(container);
+    });
+
+    describe('Tracking edits', function () {
+
+      it('no change on mount', function () {
+        assert.notOk(codeEditorEl.hasChanged());
+      });
+
+      it('detects change on user input', function () {
+        codeEditorEl.editor.setValue(code2, -1);
+
+        assert.ok(codeEditorEl.hasChanged());
+      });
+
+    });
+
+    describe('onBlur', function () {
+
+      it('calls changed function', function () {
+        codeEditorEl.editor._emit('blur');
+        assert.ok(spy.calledOnce);
+      });
+
+    });
+
+    describe('setHeightToLineCount', function () {
+
+      beforeEach(function () {
+        codeEditorEl = TestUtils.renderIntoDocument(
+          <ReactComponents.CodeEditor code={code} isFullPageEditor={false}  setHeightWithJS={true}/>,
+          container
+        );
+
+      });
+
+      it('sets line height correctly for non full page', function () {
+        var spy = sinon.spy(codeEditorEl.editor, 'setOptions');
+
+        codeEditorEl.setHeightToLineCount();
+        assert.ok(spy.calledOnce);
+        assert.equal(spy.getCall(0).args[0].maxLines, 3);
+      });
+
+    });
+
+    describe('removeIncorrectAnnotations', function () {
+
+      beforeEach(function () {
+        codeEditorEl = TestUtils.renderIntoDocument(
+          <ReactComponents.CodeEditor code={code}/>,
+          container
+        );
+
+      });
+
+      it('removes default errors that do not apply to CouchDB Views', function () {
+        assert.equal(codeEditorEl.getAnnotations(), 0);
+      });
+
+    });
+
+    describe('setEditorValue', function () {
+
+      it('sets new code', function () {
+        codeEditorEl = TestUtils.renderIntoDocument(
+          <ReactComponents.CodeEditor code={code}/>,
+          container
+        );
+
+        codeEditorEl.setEditorValue(code2);
+        assert.deepEqual(codeEditorEl.getValue(), code2);
+      });
+
+    });
+
+    describe('showEditorOnly', function () {
+
+      it('only shows editor when showEditorOnly=true', function () {
+        codeEditorEl = TestUtils.renderIntoDocument(
+          <ReactComponents.CodeEditor code={code} showEditorOnly={true} />,
+          container
+        );
+        assert.notOk($(codeEditorEl.getDOMNode()).hasClass('control-group'));
+      });
+
+      it('shows everything by default', function () {
+        var codeEditorEl = TestUtils.renderIntoDocument(
+          <ReactComponents.CodeEditor code={code} />,
+          container
+        );
+        assert.ok($(codeEditorEl.getDOMNode()).hasClass('control-group'));
+      });
+
+    });
+  });
+});


Mime
View raw message