Commit 15a0e1d6 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Fix tests for share project with group

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent 1abfc073
...@@ -8,8 +8,8 @@ class Projects::GroupLinksController < Projects::ApplicationController ...@@ -8,8 +8,8 @@ class Projects::GroupLinksController < Projects::ApplicationController
def create def create
link = project.project_group_links.new link = project.project_group_links.new
link.group_id = params[:group_id] link.group_id = params[:link_group_id]
link.group_access = params[:group_access] link.group_access = params[:link_group_access]
link.save link.save
redirect_to project_group_links_path(project) redirect_to project_group_links_path(project)
......
...@@ -27,13 +27,13 @@ ...@@ -27,13 +27,13 @@
%div %div
= form_tag project_group_links_path(@project), method: :post, class: 'form-horizontal' do = form_tag project_group_links_path(@project), method: :post, class: 'form-horizontal' do
.form-group .form-group
= label_tag :group_id, 'Group', class: 'control-label' = label_tag :link_group_id, 'Group', class: 'control-label'
.col-sm-10 .col-sm-10
= groups_select_tag(:group_id) = groups_select_tag(:link_group_id)
.form-group .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 .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 .form-actions
= submit_tag "Share", class: "btn btn-create" = submit_tag "Share", class: "btn btn-create"
...@@ -10,6 +10,7 @@ Feature: Project Group Links ...@@ -10,6 +10,7 @@ Feature: Project Group Links
Then I should see project already shared with group "Ops" Then I should see project already shared with group "Ops"
Then I should see project is not shared with group "Market" Then I should see project is not shared with group "Market"
@javascript
Scenario: I share project with group Scenario: I share project with group
When I select group "Market" for share When I select group "Market" for share
Then I should see project is shared with group "Market" Then I should see project is shared with group "Market"
...@@ -2,6 +2,7 @@ class Spinach::Features::ProjectGroupLinks < Spinach::FeatureSteps ...@@ -2,6 +2,7 @@ class Spinach::Features::ProjectGroupLinks < Spinach::FeatureSteps
include SharedAuthentication include SharedAuthentication
include SharedProject include SharedProject
include SharedPaths include SharedPaths
include Select2Helper
step 'I should see project already shared with group "Ops"' do step 'I should see project already shared with group "Ops"' do
within '.enabled-groups' do within '.enabled-groups' do
...@@ -16,8 +17,9 @@ class Spinach::Features::ProjectGroupLinks < Spinach::FeatureSteps ...@@ -16,8 +17,9 @@ class Spinach::Features::ProjectGroupLinks < Spinach::FeatureSteps
end end
step 'I select group "Market" for share' do step 'I select group "Market" for share' do
select "Master", from: 'group_access' group = Group.find_by(path: 'market')
select "Market", from: 'group_id' select2(group.id, from: "#link_group_id")
select "Master", from: 'link_group_access'
click_button "Share" click_button "Share"
end end
...@@ -35,7 +37,7 @@ class Spinach::Features::ProjectGroupLinks < Spinach::FeatureSteps ...@@ -35,7 +37,7 @@ class Spinach::Features::ProjectGroupLinks < Spinach::FeatureSteps
end end
step 'project "Shop" is not shared with group "Market"' do step 'project "Shop" is not shared with group "Market"' do
create(:group, name: 'Market') create(:group, name: 'Market', path: 'market')
end end
step 'I visit project group links page' do step 'I visit project group links page' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment