Merge branch 'master' into drop-old-fields

app/controllers/projects/group_links_controller.rb

@@ -8,8 +8,8 @@ class Projects::GroupLinksController < Projects::ApplicationController
 
   def create
     link = project.project_group_links.new
-    link.group_id = params[:group_id]
-    link.group_access = params[:group_access]
+    link.group_id = params[:link_group_id]
+    link.group_access = params[:link_group_access]
     link.save
 
     redirect_to project_group_links_path(project)

app/views/projects/group_links/index.html.haml

@@ -27,13 +27,13 @@
   %div
     = form_tag project_group_links_path(@project), method: :post, class: 'form-horizontal' do
       .form-group
-        = label_tag :group_id, 'Group', class: 'control-label'
+        = label_tag :link_group_id, 'Group', class: 'control-label'
         .col-sm-10
-          = groups_select_tag(:group_id)
+          = groups_select_tag(:link_group_id)
       .form-group
-        = label_tag :group_access, 'Max access level', class: 'control-label'
+        = label_tag :link_group_access, 'Max access level', class: 'control-label'
         .col-sm-10
-          = select_tag :group_access, options_for_select(ProjectGroupLink.access_options, ProjectGroupLink.default_access), class: "form-control"
+          = select_tag :link_group_access, options_for_select(ProjectGroupLink.access_options, ProjectGroupLink.default_access), class: "form-control"
       .form-actions
         = submit_tag "Share", class: "btn btn-create"
 

features/project/group_links.feature

@@ -10,6 +10,7 @@ Feature: Project Group Links
     Then I should see project already shared with group "Ops"
     Then I should see project is not shared with group "Market"
 
+  @javascript
   Scenario: I share project with group
     When I select group "Market" for share
     Then I should see project is shared with group "Market"

features/steps/project/project_group_links.rb

@@ -2,6 +2,7 @@ class Spinach::Features::ProjectGroupLinks < Spinach::FeatureSteps
   include SharedAuthentication
   include SharedProject
   include SharedPaths
+  include Select2Helper
 
   step 'I should see project already shared with group "Ops"' do
     within '.enabled-groups' do
@@ -16,8 +17,9 @@ class Spinach::Features::ProjectGroupLinks < Spinach::FeatureSteps
   end
 
   step 'I select group "Market" for share' do
-    select "Master", from: 'group_access'
-    select "Market", from: 'group_id'
+    group = Group.find_by(path: 'market')
+    select2(group.id, from: "#link_group_id")
+    select "Master", from: 'link_group_access'
     click_button "Share"
   end
 
@@ -35,7 +37,7 @@ class Spinach::Features::ProjectGroupLinks < Spinach::FeatureSteps
   end
 
   step 'project "Shop" is not shared with group "Market"' do
-    create(:group, name: 'Market')
+    create(:group, name: 'Market', path: 'market')
   end
 
   step 'I visit project group links page' do