Merge branch '7-4-pre' into 'master'

7.4 development

Development branch during `master` code freeze for 7.3

See merge request !1096

7 files changed, 24 insertions, 16 deletions

diff --git a/features/steps/admin/groups.rb b/features/steps/admin/groups.rb
index 9c1bcfefb9c..d761584ad93 100644
--- a/features/steps/admin/groups.rb
+++ b/features/steps/admin/groups.rb
@@ -40,7 +40,7 @@ class AdminGroups < Spinach::FeatureSteps
     user = User.find_by(name: "John Doe")
     select2(user.id, from: "#user_ids", multiple: true)
     within "#new_team_member" do
-      select "Reporter", from: "group_access"
+      select "Reporter", from: "access_level"
     end
     click_button "Add users into group"
   end
diff --git a/features/steps/dashboard/event_filters.rb b/features/steps/dashboard/event_filters.rb
index d0fe5c9b64b..801ea400a7a 100644
--- a/features/steps/dashboard/event_filters.rb
+++ b/features/steps/dashboard/event_filters.rb
@@ -82,6 +82,4 @@ class EventFilters < Spinach::FeatureSteps
   When 'I click "merge" event filter' do
     click_link("merged_event_filter")
   end
-
 end
-
diff --git a/features/steps/group/group.rb b/features/steps/group/group.rb
index c3ee42f1127..d0ec503f47b 100644
--- a/features/steps/group/group.rb
+++ b/features/steps/group/group.rb
@@ -32,7 +32,7 @@ class Groups < Spinach::FeatureSteps
     click_link 'Add members'
     within ".users-group-form" do
       select2(user.id, from: "#user_ids", multiple: true)
-      select "Reporter", from: "group_access"
+      select "Reporter", from: "access_level"
     end
     click_button "Add users into group"
   end
diff --git a/features/steps/project/browse_files.rb b/features/steps/project/browse_files.rb
index d5e44f796ca..9ea9c7cf138 100644
--- a/features/steps/project/browse_files.rb
+++ b/features/steps/project/browse_files.rb
@@ -77,7 +77,9 @@ class ProjectBrowseFiles < Spinach::FeatureSteps
   end
 
   step 'I click on readme file' do
-    click_link 'README.md'
+    within '.tree-table' do
+      click_link 'README.md'
+    end
   end
 
   step 'I see Browse file link' do
diff --git a/features/steps/project/markdown_render.rb b/features/steps/project/markdown_render.rb
index 1885649891e..83572718f39 100644
--- a/features/steps/project/markdown_render.rb
+++ b/features/steps/project/markdown_render.rb
@@ -79,9 +79,17 @@ class Spinach::Features::ProjectMarkdownRender < Spinach::FeatureSteps
   end
 
   And 'I navigate to the doc/api/README' do
-    click_link "doc"
-    click_link "api"
-    click_link "README.md"
+    within '.tree-table' do
+      click_link "doc"
+    end
+
+    within '.tree-table' do
+      click_link "api"
+    end
+
+    within '.tree-table' do
+      click_link "README.md"
+    end
   end
 
   And 'I see correct file rendered' do
diff --git a/features/steps/project/team_management.rb b/features/steps/project/team_management.rb
index ffc5016529f..76a0671721e 100644
--- a/features/steps/project/team_management.rb
+++ b/features/steps/project/team_management.rb
@@ -23,8 +23,8 @@ class ProjectTeamManagement < Spinach::FeatureSteps
     user = User.find_by(name: "Mike")
 
     select2(user.id, from: "#user_ids", multiple: true)
-    within "#new_team_member" do
-      select "Reporter", from: "project_access"
+    within "#new_project_member" do
+      select "Reporter", from: "access_level"
     end
     click_button "Add users"
   end
@@ -44,7 +44,7 @@ class ProjectTeamManagement < Spinach::FeatureSteps
   And 'I change "Sam" role to "Reporter"' do
     user = User.find_by(name: "Sam")
     within "#user_#{user.id}" do
-      select "Reporter", from: "team_member_project_access"
+      select "Reporter", from: "project_member_access_level"
     end
   end
 
diff --git a/features/support/env.rb b/features/support/env.rb
index 22f28987fe3..4b76faab564 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -1,20 +1,20 @@
-require 'simplecov' unless ENV['CI']
+if ENV['SIMPLECOV']
+  require 'simplecov'
+end
 
-if ENV['TRAVIS']
+if ENV['COVERALLS']
   require 'coveralls'
-  Coveralls.wear!
+  Coveralls.wear_merged!('rails')
 end
 
 ENV['RAILS_ENV'] = 'test'
 require './config/environment'
-
 require 'rspec'
 require 'rspec/expectations'
 require 'database_cleaner'
 require 'spinach/capybara'
 require 'sidekiq/testing/inline'
 
-
 %w(select2_helper test_env repo_helpers).each do |f|
   require Rails.root.join('spec', 'support', f)
 end