Download as
Browse Code »

Commit b8ba0b759cd474c7097078057cad40fb8922f4e0

Authored by Dmitriy Zaporozhets
1 parent 630c547d
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

disable capybra 2.1 ingore hidden elements

Showing 2 changed files with 6 additions and 6 deletions   Show diff stats
features/steps/project/project_team_management.rb
  Diff comments   View file @b8ba0b7
@@ -24,7 +24,7 @@ class ProjectTeamManagement < Spinach::FeatureSteps @@ -24,7 +24,7 @@ class ProjectTeamManagement < Spinach::FeatureSteps
24 24
25 select2(user.id, from: "#user_ids", multiple: true) 25 select2(user.id, from: "#user_ids", multiple: true)
26 within "#new_team_member" do 26 within "#new_team_member" do
27 - select "Reporter", :from => "project_access" 27 + select "Reporter", from: "project_access"
28 end 28 end
29 click_button "Add users" 29 click_button "Add users"
30 end 30 end
@@ -44,7 +44,7 @@ class ProjectTeamManagement < Spinach::FeatureSteps @@ -44,7 +44,7 @@ class ProjectTeamManagement < Spinach::FeatureSteps
44 And 'I change "Sam" role to "Reporter"' do 44 And 'I change "Sam" role to "Reporter"' do
45 user = User.find_by_name("Sam") 45 user = User.find_by_name("Sam")
46 within ".user_#{user.id}" do 46 within ".user_#{user.id}" do
47 - select "Reporter", :from => "team_member_project_access" 47 + select "Reporter", from: "team_member_project_access"
48 end 48 end
49 end 49 end
50 50
@@ -65,11 +65,11 @@ class ProjectTeamManagement < Spinach::FeatureSteps @@ -65,11 +65,11 @@ class ProjectTeamManagement < Spinach::FeatureSteps
65 end 65 end
66 66
67 And 'gitlab user "Mike"' do 67 And 'gitlab user "Mike"' do
68 - create(:user, :name => "Mike") 68 + create(:user, name: "Mike")
69 end 69 end
70 70
71 And 'gitlab user "Sam"' do 71 And 'gitlab user "Sam"' do
72 - create(:user, :name => "Sam") 72 + create(:user, name: "Sam")
73 end 73 end
74 74
75 And '"Sam" is "Shop" developer' do 75 And '"Sam" is "Shop" developer' do
@@ -79,7 +79,7 @@ class ProjectTeamManagement < Spinach::FeatureSteps @@ -79,7 +79,7 @@ class ProjectTeamManagement < Spinach::FeatureSteps
79 end 79 end
80 80
81 Given 'I own project "Website"' do 81 Given 'I own project "Website"' do
82 - @project = create(:project, :name => "Website") 82 + @project = create(:project, name: "Website")
83 @project.team << [@user, :master] 83 @project.team << [@user, :master]
84 end 84 end
85 85
features/support/env.rb
  Diff comments   View file @b8ba0b7
@@ -30,7 +30,7 @@ Spinach.hooks.on_tag(&quot;javascript&quot;) do @@ -30,7 +30,7 @@ Spinach.hooks.on_tag(&quot;javascript&quot;) do
30 ::Capybara.current_driver = ::Capybara.javascript_driver 30 ::Capybara.current_driver = ::Capybara.javascript_driver
31 end 31 end
32 Capybara.default_wait_time = 10 32 Capybara.default_wait_time = 10
33 - 33 +Capybara.ignore_hidden_elements = false
34 34
35 DatabaseCleaner.strategy = :truncation 35 DatabaseCleaner.strategy = :truncation
36 36