Merge pull request #236 from finnlabs/fix/backlogs-issues

Backlogs styling issues

.travis.yml

@@ -33,17 +33,18 @@
 language: ruby
 
 rvm:
-  - 2.2.3
+  - 2.2.5
 
 sudo: false
 
 cache:
-  - bundler: true
+  bundler: true
-  - directories:
+  directories:
     - frontend/node_modules
     - frontend/bower_components
 
-bundler_args: --without development production
+
+bundler_args: --without development production docker
 
 branches:
   only:
@@ -63,17 +64,15 @@ env:
 
     - "TEST_SUITE=npm"
 
-    - "TEST_SUITE=spec_legacy       DB=mysql     GROUP_SIZE=2  GROUP=1"
+    - "TEST_SUITE=spec_legacy       DB=mysql"
-    - "TEST_SUITE=spec_legacy       DB=mysql     GROUP_SIZE=2  GROUP=2"
+    - "TEST_SUITE=cucumber          DB=mysql     GROUP_SIZE=2  GROUP=1"
-    - "TEST_SUITE=cucumber          DB=mysql     GROUP_SIZE=3  GROUP=1"
+    - "TEST_SUITE=cucumber          DB=mysql     GROUP_SIZE=2  GROUP=2"
-    - "TEST_SUITE=cucumber          DB=mysql     GROUP_SIZE=3  GROUP=2"
+    - "TEST_SUITE=specs             DB=mysql     GROUP_SIZE=3  GROUP=1"
-    - "TEST_SUITE=cucumber          DB=mysql     GROUP_SIZE=3  GROUP=3"
+    - "TEST_SUITE=specs             DB=mysql     GROUP_SIZE=3  GROUP=2"
-    - "TEST_SUITE=rspec             DB=mysql     GROUP_SIZE=6  GROUP=1"
+    - "TEST_SUITE=specs             DB=mysql     GROUP_SIZE=3  GROUP=3"
-    - "TEST_SUITE=rspec             DB=mysql     GROUP_SIZE=6  GROUP=2"
+    - "TEST_SUITE=features          DB=mysql     GROUP_SIZE=3  GROUP=1"
-    - "TEST_SUITE=rspec             DB=mysql     GROUP_SIZE=6  GROUP=3"
+    - "TEST_SUITE=features          DB=mysql     GROUP_SIZE=3  GROUP=2"
-    - "TEST_SUITE=rspec             DB=mysql     GROUP_SIZE=6  GROUP=4"
+    - "TEST_SUITE=features          DB=mysql     GROUP_SIZE=3  GROUP=3"
-    - "TEST_SUITE=rspec             DB=mysql     GROUP_SIZE=6  GROUP=5"
-    - "TEST_SUITE=rspec             DB=mysql     GROUP_SIZE=6  GROUP=6"
 
 before_install:
   # Custom plugin instructions follow.
@@ -98,6 +97,11 @@ before_install:
   - "export DISPLAY=:99.0"
   - "/sbin/start-stop-daemon --start -v --pidfile ./tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1920x1080x16"
   - "echo `xdpyinfo -display :99 | grep 'dimensions' | awk '{ print $2 }'`"
+  # Install Node LTS Boron (6.9.1)
+  - nvm install 6.9.1
+  # We need npm 4.0 for a bugfix in cross-platform shrinkwrap
+  # https://github.com/npm/npm/issues/14042
+  - npm install npm@4.0
   - travis_retry npm install
 
   # We need phantomjs 2.0 to get tests passing
@@ -110,7 +114,7 @@ before_script:
   - sh script/ci_setup.sh $DB
 
 script:
-  - sh script/ci_runner.sh $TEST_SUITE $GROUP_SIZE $GROUP
+  - sh script/ci_runner.sh
 
 addons:
   firefox: "45.0esr"

Gemfile.plugins

@@ -0,0 +1,8 @@
+# Used by travis to bundle this plugin with the OpenProject core.
+# The tested plugin will be moved to the path `./plugins/this`
+# whereas OpenProject will be checked out to `.`.
+
+group :opf_plugins do
+  gem 'openproject-pdf_export', git: 'https://github.com/finnlabs/openproject-pdf_export', branch: 'dev'
+  gem 'openproject-backlogs', path: 'plugins/this'
+end

app/assets/javascripts/backlogs/model.js

@@ -129,7 +129,7 @@ RB.Model = (function ($) {
         },
         ],
         close: function (e, ui) {
-          if (e.which === 27) {
+          if (e.which === 1 || e.which === 27) {
             self.cancelEdit();
           }
         },

app/assets/stylesheets/backlogs/master_backlog.css.sass

@@ -134,7 +134,7 @@
           right: 25px
           text-align: right
           top: 0px
-          width: 28px
+          width: 32px
         .toggler
           font-family: "openproject-icon-font"
           height: 30px
@@ -260,7 +260,7 @@
         width: 3.5rem
         min-height: 14px
         height: 2rem
-        text-align: right
+        text-align: center
       .type_id .v, .id .v, .status_id .v, .fixed_version_id, .higher_item_id
         display: none
 
@@ -322,13 +322,13 @@
       max-width: 140px
       /* for the cool guys */
     .subject.editor
-      width: 60%
+      width: 55%
     .status_id.editor
       width: 15%
       float: right
     .story_points.editor
       float: right
-      width: 5%
+      width: 10%
 
 /* In-place Story Editor */
 

app/views/rb_taskboards/show.html.erb

@@ -38,7 +38,7 @@ See doc/COPYRIGHT.rdoc for more details.
   <%= render :partial => 'shared/backlogs_header' %>
   <%= stylesheet_link_tag 'backlogs/taskboard.css' %>
 <% end %>
-<%= html_title @sprint.name %>
+<% html_title @sprint.name %>
 <%= toolbar title: @sprint.name do %>
   <li class="toolbar-item toolbar-input-group" id="col_width">
     <div>

spec/features/work_packages/story_points_spec.rb

@@ -46,7 +46,8 @@ describe 'Work packages having story points', type: :feature, js: true do
   end
 
   let(:current_user) { FactoryGirl.create(:admin) }
-  let(:project) { FactoryGirl.create(:project) }
+  let(:project) { FactoryGirl.create(:project,
+                                     enabled_module_names: %w(work_package_tracking backlogs)) }
   let(:status) { FactoryGirl.create :default_status }
   let(:story_type) { FactoryGirl.create(:type_feature) }
   let(:task_type) { FactoryGirl.create(:type_feature) }
@@ -66,6 +67,9 @@ describe 'Work packages having story points', type: :feature, js: true do
       wp_page = Pages::FullWorkPackage.new(story_with_sp)
 
       wp_page.visit!
+      wp_page.expect_subject
+
+      wp_page.view_all_attributes
 
       wp_page.expect_attributes :storyPoints => story_points