GitLab steht wegen Wartungsarbeiten am Montag, den 10. Mai, zwischen 17:00 und 19:00 Uhr nicht zur Verfügung.

Commit def6c43d authored by Jose Ivan Vargas's avatar Jose Ivan Vargas

Fixed more rspec tests as well as spinach features

parent 68c730bb
......@@ -6,7 +6,8 @@ class Projects::ProjectMembersController < Projects::ApplicationController
before_action :authorize_admin_project_member!, except: [:index, :leave, :request_access]
def index
redirect_to namespace_project_settings_members_path(@project.namespace, @project)
sort = params[:sort].presence || sort_value_name
redirect_to namespace_project_settings_members_path(@project.namespace, @project, sort: sort)
end
def create
......
......@@ -2,7 +2,7 @@
.col-lg-3.settings-sidebar
%h4.prepend-top-0
Members
= link_to "Import", import_namespace_project_project_members_path(@project.namespace, @project), class: "btn btn-default hidden-xs visible-sm pull-right", title: "Import members from another project"
= link_to "Import", import_namespace_project_project_members_path(@project.namespace, @project), class: "btn btn-default visible-xs visible-sm pull-right", title: "Import members from another project"
- if can?(current_user, :admin_project_member, @project)
%p
Add new user to
......
......@@ -113,8 +113,10 @@ class Spinach::Features::ProjectTeamManagement < Spinach::FeatureSteps
project.team << [user, :reporter]
end
step 'I click link "Import team from another project"' do
click_link "Import"
step 'I click link "Import team from another project"' do
page.within '.users-project-form' do
click_link "Import"
end
end
When 'I submit "Website" project for import team' do
......
......@@ -17,7 +17,6 @@
scenario 'expiration date is displayed in the members list' do
travel_to Time.zone.parse('2016-08-06 08:00') do
visit namespace_project_settings_members_path(project.namespace, project)
save_screenshot
page.within '.users-project-form' do
select2(new_member.id, from: '#user_ids', multiple: true)
......
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