Commit 496b7da7 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Fix spinach tests

parent 1587caa3
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
%td= @team.admin?(member) ? "Admin" : "Member" %td= @team.admin?(member) ? "Admin" : "Member"
%td %td
%tr %tr
%td= select_tag :user_ids, options_from_collection_for_select(@users , :id, :name_with_email), multiple: true, data: {placeholder: 'Select users'}, class: 'chosen span5' %td= select_tag :user_ids, options_from_collection_for_select(@users , :id, :name_with_username), multiple: true, data: {placeholder: 'Select users'}, class: 'chosen span5'
%td= select_tag :default_project_access, options_for_select(Project.access_options), {class: "project-access-select chosen span3" } %td= select_tag :default_project_access, options_for_select(Project.access_options), {class: "project-access-select chosen span3" }
%td %td
%span= check_box_tag :group_admin %span= check_box_tag :group_admin
......
...@@ -46,13 +46,13 @@ class AdminTeams < Spinach::FeatureSteps ...@@ -46,13 +46,13 @@ class AdminTeams < Spinach::FeatureSteps
Then 'I should see only me in members table' do Then 'I should see only me in members table' do
members_list = find("#members_list .member") members_list = find("#members_list .member")
members_list.should have_content(current_user.name) members_list.should have_content(current_user.name)
members_list.should have_content(current_user.email) members_list.should have_content(current_user.username)
end end
When 'I select user "John" from user list as "Developer"' do When 'I select user "John" from user list as "Developer"' do
@user ||= User.find_by_name("John") @user ||= User.find_by_name("John")
within "#team_members" do within "#team_members" do
select "#{@user.name} (#{@user.email})", from: "user_ids" select "#{@user.name} (#{@user.username})", from: "user_ids"
select "Developer", from: "default_project_access" select "Developer", from: "default_project_access"
end end
end end
...@@ -129,7 +129,7 @@ class AdminTeams < Spinach::FeatureSteps ...@@ -129,7 +129,7 @@ class AdminTeams < Spinach::FeatureSteps
When 'I select user "Jimm" ub team members list as "Master"' do When 'I select user "Jimm" ub team members list as "Master"' do
user = User.find_by_name("Jimm") user = User.find_by_name("Jimm")
within "#team_members" do within "#team_members" do
select "#{user.name} (#{user.email})", from: "user_ids" select "#{user.name} (#{user.username})", from: "user_ids"
select "Developer", from: "default_project_access" select "Developer", from: "default_project_access"
end end
end end
......
...@@ -21,7 +21,7 @@ class ProjectTeamManagement < Spinach::FeatureSteps ...@@ -21,7 +21,7 @@ class ProjectTeamManagement < Spinach::FeatureSteps
And 'I select "Mike" as "Reporter"' do And 'I select "Mike" as "Reporter"' do
user = User.find_by_name("Mike") user = User.find_by_name("Mike")
within "#new_team_member" do within "#new_team_member" do
select user.name, :from => "user_ids" select "#{user.name} (#{user.username})", :from => "user_ids"
select "Reporter", :from => "project_access" select "Reporter", :from => "project_access"
end end
click_button "Add users" click_button "Add users"
......
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