Merge branch 'master' into ZNTA-2147

zanata · Aug 28, 2017 · 10e0fea · 10e0fea
2 parents a8aaf59 + c7100cc
commit 10e0fea
Show file tree

Hide file tree

Showing 16 changed files with 139 additions and 261 deletions.
diff --git a/server/pom.xml b/server/pom.xml
@@ -218,6 +218,12 @@
         <scope>test</scope>
       </dependency>
 
+      <dependency>
+        <groupId>com.googlecode.junit-toolbox</groupId>
+        <artifactId>junit-toolbox</artifactId>
+        <version>2.3</version>
+        <scope>test</scope>
+      </dependency>
       <dependency>
         <groupId>org.jboss.resteasy</groupId>
         <artifactId>resteasy-jaxrs</artifactId>

diff --git a/server/services/pom.xml b/server/services/pom.xml
@@ -1144,6 +1144,12 @@
       <scope>test</scope>
     </dependency>
 
+    <dependency>
+      <groupId>com.googlecode.junit-toolbox</groupId>
+      <artifactId>junit-toolbox</artifactId>
+      <scope>test</scope>
+    </dependency>
+
     <dependency>
       <groupId>org.concordion</groupId>
       <artifactId>concordion</artifactId>

diff --git a/server/services/src/test/java/ServicesITCases.kt b/server/services/src/test/java/ServicesITCases.kt
@@ -0,0 +1,14 @@
+import com.googlecode.junittoolbox.SuiteClasses
+import com.googlecode.junittoolbox.WildcardPatternSuite
+import org.junit.runner.RunWith
+
+/**
+ * This JUnit Suite class provides a way of running all the Arquillian tests
+ * in 'services' from IntelliJ. To use it, just create an Arquillian Run
+ * Configuration and choose this class in the Configuration tab
+ * instead of an individual test.
+ * @author Sean Flanigan <a href="mailto:sflaniga@redhat.com">sflaniga@redhat.com</a>
+ */
+@RunWith(WildcardPatternSuite::class)
+@SuiteClasses("**/*ITCase.class")
+class ServicesITCases
diff --git a/server/services/src/test/java/ServicesUTCases.kt b/server/services/src/test/java/ServicesUTCases.kt
@@ -0,0 +1,12 @@
+import com.googlecode.junittoolbox.SuiteClasses
+import com.googlecode.junittoolbox.WildcardPatternSuite
+import org.junit.runner.RunWith
+
+/**
+ * This JUnit Suite class provides a way of running all the unit tests
+ * in 'services' from IntelliJ (without picking up integration tests).
+ * @author Sean Flanigan <a href="mailto:sflaniga@redhat.com">sflaniga@redhat.com</a>
+ */
+@RunWith(WildcardPatternSuite::class)
+@SuiteClasses("**/*Test.class", "**/*Tests.class")
+class ServicesUTCases
diff --git a/server/zanata-frontend/src/frontend/app/editor/app.css b/server/zanata-frontend/src/frontend/app/editor/app.css
@@ -22,8 +22,6 @@
 @import './components/SplitDropdown/index.css';
 @import './components/Button/index.css';
 @import './components/GlossaryTermModal/index.css';
-@import './components/GlossarySearchInput/index.css';
-@import './components/SuggestionSearchInput/index.css';
 @import './components/Dropdown/index.css';
 @import './containers/EditorHeader/index.css';
 @import './components/EditorSearchInput/index.css';
@@ -36,6 +34,7 @@
 @import './components/ToggleSwitch/index.css';
 @import './components/TransUnit/index.css';
 @import './components/RejectTranslationModal/index.css';
+@import './components/InputGroup/index.css';
 
 /**
  * Views

diff --git a/server/zanata-frontend/src/frontend/app/editor/components/EditorSearchInput/index.css b/server/zanata-frontend/src/frontend/app/editor/components/EditorSearchInput/index.css
@@ -1,14 +1,3 @@
-/** @define InputGroup; use strict */
-
-:root {
-  --InputGroup-rhythm: 1.5rem;
-  --InputGroup-input-color: #20718A;
-  --InputGroup-addon-color: color(#20718A tint(30%));
-  --InputGroup-border-color: color(#20718A tint(60%));
-  --InputGroup-border--focus-color: color(#20718A tint(30%));
-  --InputGroup-transition: 0.2s cubic-bezier(.26, .47, .36, .94);
-}
-
 .InputEditorSearch {
   margin-left: 0.75em;
   margin-right: 1em;
@@ -75,77 +64,6 @@ li.inline-search-list span {
   color: #20718A;
 }
 
-.InputGroup {
-  position: relative;
-  display: table;
-  border-collapse: separate;
-}
-
-.InputGroup-input, .InputGroup-addon, .InputGroup-button {
-  display: table-cell;
-  transition: var(--InputGroup-transition);
-}
-
-.InputGroup-input, .InputGroup-addon {
-  background-color: transparent;
-  padding: 0 calc(var(--InputGroup-rhythm) * .25);
-}
-
-.InputGroup-input {
-  border: none;
-  color: var(--InputGroup-input-color);
-}
-
-.InputGroup-addon {
-  color: var(--InputGroup-addon-color);
-  text-align: center;
-  width: 1%;
-  white-space: nowrap;
-  vertical-align: middle;
-}
-
-.InputGroup-addon:before {
-  content: ' ';
-}
-
-.InputGroup.is-focused .InputGroup-input, .InputGroup.is-focused .InputGroup-addon {
-  background-color: #fff;
-}
-
-.InputGroup--bordered .InputGroup-input, .InputGroup--bordered .InputGroup-addon, .InputGroup--outlined .InputGroup-input, .InputGroup--outlined .InputGroup-addon {
-  border-top: 1px solid var(--InputGroup-border-color);
-  border-bottom: 1px solid var(--InputGroup-border-color);
-}
-
-.InputGroup--bordered .InputGroup-input {
-  border-left: 1px solid var(--InputGroup-border-color);
-  border-right: 1px solid var(--InputGroup-border-color);
-}
-
-.InputGroup--outlined .InputGroup-input:first-child, .InputGroup--outlined .InputGroup-addon:first-child {
-  border-left: 1px solid var(--InputGroup-border-color);
-}
-
-.InputGroup--outlined .InputGroup-input:last-child, .InputGroup--outlined .InputGroup-addon:last-child {
-  border-right: 1px solid var(--InputGroup-border-color);
-}
-
-.InputGroup--bordered.is-focused .InputGroup-input, .InputGroup--bordered.is-focused .InputGroup-addon, .InputGroup--outlined.is-focused .InputGroup-input, .InputGroup--outlined.is-focused .InputGroup-addon {
-  border-color: var(--InputGroup-border--focus-color);
-}
-
-.InputGroup--rounded .InputGroup-input:first-child, .InputGroup--rounded .InputGroup-addon:first-child {
-  border-bottom-left-radius: calc(var(--InputGroup-rhythm) * 1);
-  border-top-left-radius: calc(var(--InputGroup-rhythm) * 1);
-  padding-left: calc(var(--InputGroup-rhythm) * .375);
-}
-
-.InputGroup--rounded .InputGroup-input:last-child, .InputGroup--rounded .InputGroup-addon:last-child {
-  border-bottom-right-radius: calc(var(--InputGroup-rhythm) * 1);
-  border-top-right-radius: calc(var(--InputGroup-rhythm) * 1);
-  padding-right: calc(var(--InputGroup-rhythm) * .375);
-}
-
 .InputEditorSearch .panel.panel-default {
   z-index: 1000 !important;
 }

diff --git a/server/zanata-frontend/src/frontend/app/editor/components/GlossaryTermModal/component.js b/server/zanata-frontend/src/frontend/app/editor/components/GlossaryTermModal/component.js
@@ -72,7 +72,7 @@ class GlossaryTermModal extends React.Component {
       <Modal show={show}
         onHide={close}
         key="glosssary-term-modal"
-        className="suggestions-modal">
+        id="GlossaryTermModal">
         <Modal.Header>
           <Modal.Title><small><span className="pull-left">
           Glossary details</span></small></Modal.Title>

diff --git a/.../components/GlossarySearchInput/index.css → ...pp/editor/components/InputGroup/index.css b/.../components/GlossarySearchInput/index.css → ...pp/editor/components/InputGroup/index.css
@@ -1,12 +1,10 @@
-/** @define InputGroup; use strict */
-
 :root {
-  --InputGroup-rhythm: 1.5rem;
-  --InputGroup-input-color: #20718A;
-  --InputGroup-addon-color: color(#20718A tint(30%));
-  --InputGroup-border-color: color(#20718A tint(60%));
-  --InputGroup-border--focus-color: color(#20718A tint(30%));
-  --InputGroup-transition: 0.2s cubic-bezier(.26, .47, .36, .94);
+--InputGroup-rhythm: 1.5rem;
+--InputGroup-input-color: #20718A;
+--InputGroup-addon-color: color(#20718A tint(30%));
+--InputGroup-border-color: color(#20718A tint(60%));
+--InputGroup-border--focus-color: color(#20718A tint(30%));
+--InputGroup-transition: 0.2s cubic-bezier(.26, .47, .36, .94);
 }
 
 .InputGroup {

diff --git a/server/zanata-frontend/src/frontend/app/editor/components/RejectTranslationModal/index.css b/server/zanata-frontend/src/frontend/app/editor/components/RejectTranslationModal/index.css
@@ -1,49 +1,50 @@
 :root {
-  --TM-input-border:            solid 1px rgb(99, 156, 173);
-  --TM-input-border-radius:     8px;
-  --TM-large-spacing:           6rem;
-  --TM-default-margin:          0.75rem;
-  --TM-small-margin:            0.375rem;
-  --TM-text-color:              rgb(84, 102, 119);
-  --TM-icon-vert-alignment:     middle;
-  --TM-dropdown-text-color:     #03a6d7;
+  --TM-input-border: solid 1px rgb(99, 156, 173);
+  --TM-input-border-radius: 8px;
+  --TM-large-spacing: 6rem;
+  --TM-default-margin: 0.75rem;
+  --TM-small-margin: 0.375rem;
+  --TM-text-color: rgb(84, 102, 119);
+  --TM-icon-vert-alignment: middle;
+  --TM-dropdown-text-color: #03a6d7;
 }
 
-.flex {
+#RejectTranslationModal .flex {
   flex-direction: row;
   align-items: center;
 }
 
 #prioritytitle, #criteriatitle {
   margin-right: var(--TM-default-margin);
 }
-.modal-body {
+
+#RejectTranslationModal .modal-body {
   color: var(--TM-text-color);
 }
 
-.priority-dd {
+#RejectTranslationModal .priority-dd {
   margin-left: 1.5rem;
 }
 
-.InputGroup--outlined {
-  border: var(--TM-input-border);
+#RejectTranslationModal .modal-body .InputGroup--outlined {
+  border: var(--TM-input-border) !important;
 }
 
-.Dropdown {
+#RejectTranslationModal .modal-body .Dropdown {
   border-radius: var(--TM-input-border-radius);
-  border: var(--TM-input-border);
+  border: var(--TM-input-border) !important;
 }
 
-.criteria {
+#RejectTranslationModal .criteria {
   flex-grow: 2;
 }
 
-a.Dropdown-item span.s0 {
+#RejectTranslationModal a.Dropdown-item span.s0 {
   vertical-align: var(--TM-icon-vert-alignment);
   margin-left: var(--TM-small-margin);
- }
+}
 
-.InputGroup--outlined.commenting {
+#RejectTranslationModal .InputGroup--outlined.commenting {
   margin-top: 2rem;
   max-width: 100%;
   min-width: 100%;
@@ -53,33 +54,33 @@ a.Dropdown-item span.s0 {
   min-height: var(--TM-large-spacing);
 }
 
-.modal-footer .Button--primary {
+#RejectTranslationModal .modal-footer .Button--primary {
   margin-left: var(--TM-default-margin);
 }
 
 .priority-dd .s2, .priority-dd .s2 svg {
   vertical-align: sub;
 }
 
-.Dropdown-item {
+#RejectTranslationModal .Dropdown-item {
   color: var(--TM-dropdown-text-color);
 }
 
-.Dropdown-item:hover {
+#RejectTranslationModal .Dropdown-item:hover {
   background-color: #fcfcfc;
   color: var(--TM-dropdown-text-color);
 }
 
-.Dropdown-toggle .Dropdown-item:hover {
+#RejectTranslationModal .Dropdown-toggle .Dropdown-item:hover {
   border-radius: 0.4rem;
 }
 
-.Dropdown-item span.n1 {
+#RejectTranslationModal .Dropdown-item span.n1 {
   margin-left: var(--TM-small-margin);
   vertical-align: var(--TM-icon-vert-alignment);
 }
 
-button.close {
+#RejectTranslationModal button.close {
   display: none;
   visibility: hidden;
 }
diff --git a/server/zanata-frontend/src/frontend/app/editor/components/RejectTranslationModal/index.js b/server/zanata-frontend/src/frontend/app/editor/components/RejectTranslationModal/index.js
@@ -74,7 +74,7 @@ export class RejectTranslationModal extends Component {
       <Modal show={show}
         onHide={close}
         key="reject-translation-modal"
-        className="suggestions-modal">
+        id="RejectTranslationModal">
         <Modal.Header>
           <Modal.Title>Reject translation</Modal.Title>
         </Modal.Header>