Commit 37187336b1ae92751d98f33d1f378aac069ecdaa
1 parent
28da2a8b
Exists in
master
and in
4 other branches
Team features are green now
Showing
7 changed files
with
21 additions
and
21 deletions
Show diff stats
features/project/source/browse_files.feature
| ... | ... | @@ -12,7 +12,7 @@ Feature: Project Browse files |
| 12 | 12 | Then I should see files from repository for "8470d70" |
| 13 | 13 | |
| 14 | 14 | Scenario: I browse file content |
| 15 | - Given I click on "Gemfile" file in repo | |
| 15 | + Given I click on "Gemfile.lock" file in repo | |
| 16 | 16 | Then I should see it content |
| 17 | 17 | |
| 18 | 18 | Scenario: I browse raw file |
| ... | ... | @@ -22,6 +22,6 @@ Feature: Project Browse files |
| 22 | 22 | |
| 23 | 23 | @javascript |
| 24 | 24 | Scenario: I can edit file |
| 25 | - Given I click on "Gemfile" file in repo | |
| 25 | + Given I click on "Gemfile.lock" file in repo | |
| 26 | 26 | And I click button "edit" |
| 27 | 27 | Then I can edit code | ... | ... |
features/project/source/git_blame.feature
features/steps/admin/admin_teams.rb
| ... | ... | @@ -9,7 +9,7 @@ class AdminTeams < Spinach::FeatureSteps |
| 9 | 9 | end |
| 10 | 10 | |
| 11 | 11 | And 'Create gitlab user "John"' do |
| 12 | - @user = create(:user, :name => "John") | |
| 12 | + @user = create(:user, name: "John") | |
| 13 | 13 | end |
| 14 | 14 | |
| 15 | 15 | And 'I click new team link' do |
| ... | ... | @@ -50,8 +50,8 @@ class AdminTeams < Spinach::FeatureSteps |
| 50 | 50 | When 'I select user "John" from user list as "Developer"' do |
| 51 | 51 | @user ||= User.find_by_name("John") |
| 52 | 52 | within "#team_members" do |
| 53 | - select @user.name, :from => "user_ids" | |
| 54 | - select "Developer", :from => "default_project_access" | |
| 53 | + select "#{@user.name} (#{@user.email})", from: "user_ids" | |
| 54 | + select "Developer", from: "default_project_access" | |
| 55 | 55 | end |
| 56 | 56 | end |
| 57 | 57 | |
| ... | ... | @@ -89,8 +89,8 @@ class AdminTeams < Spinach::FeatureSteps |
| 89 | 89 | When 'I select project "Shop" with max access "Reporter"' do |
| 90 | 90 | @project ||= Project.find_by_name("Shop") |
| 91 | 91 | within "#assign_projects" do |
| 92 | - select @project.name, :from => "project_ids" | |
| 93 | - select "Reporter", :from => "greatest_project_access" | |
| 92 | + select @project.name, from: "project_ids" | |
| 93 | + select "Reporter", from: "greatest_project_access" | |
| 94 | 94 | end |
| 95 | 95 | |
| 96 | 96 | end |
| ... | ... | @@ -127,8 +127,8 @@ class AdminTeams < Spinach::FeatureSteps |
| 127 | 127 | When 'I select user "Jimm" ub team members list as "Master"' do |
| 128 | 128 | user = User.find_by_name("Jimm") |
| 129 | 129 | within "#team_members" do |
| 130 | - select user.name, :from => "user_ids" | |
| 131 | - select "Developer", :from => "default_project_access" | |
| 130 | + select "#{user.name} (#{user.email})", from: "user_ids" | |
| 131 | + select "Developer", from: "default_project_access" | |
| 132 | 132 | end |
| 133 | 133 | end |
| 134 | 134 | ... | ... |
features/steps/project/project_browse_files.rb
| ... | ... | @@ -16,12 +16,12 @@ class ProjectBrowseFiles < Spinach::FeatureSteps |
| 16 | 16 | page.should have_content "Gemfile" |
| 17 | 17 | end |
| 18 | 18 | |
| 19 | - Given 'I click on "Gemfile" file in repo' do | |
| 20 | - click_link "Gemfile" | |
| 19 | + Given 'I click on "Gemfile.lock" file in repo' do | |
| 20 | + click_link "Gemfile.lock" | |
| 21 | 21 | end |
| 22 | 22 | |
| 23 | 23 | Then 'I should see it content' do |
| 24 | - page.should have_content "rubygems.org" | |
| 24 | + page.should have_content "DEPENDENCIES" | |
| 25 | 25 | end |
| 26 | 26 | |
| 27 | 27 | And 'I click link "raw"' do | ... | ... |
features/steps/project/project_browse_git_repo.rb
| ... | ... | @@ -3,8 +3,8 @@ class ProjectBrowseGitRepo < Spinach::FeatureSteps |
| 3 | 3 | include SharedProject |
| 4 | 4 | include SharedPaths |
| 5 | 5 | |
| 6 | - Given 'I click on "Gemfile" file in repo' do | |
| 7 | - click_link "Gemfile" | |
| 6 | + Given 'I click on "Gemfile.lock" file in repo' do | |
| 7 | + click_link "Gemfile.lock" | |
| 8 | 8 | end |
| 9 | 9 | |
| 10 | 10 | And 'I click blame button' do |
| ... | ... | @@ -12,7 +12,7 @@ class ProjectBrowseGitRepo < Spinach::FeatureSteps |
| 12 | 12 | end |
| 13 | 13 | |
| 14 | 14 | Then 'I should see git file blame' do |
| 15 | - page.should have_content "rubygems.org" | |
| 15 | + page.should have_content "DEPENDENCIES" | |
| 16 | 16 | page.should have_content "Dmitriy Zaporozhets" |
| 17 | 17 | page.should have_content "Moving to rails 3.2" |
| 18 | 18 | end | ... | ... |
features/steps/userteams/userteams.rb
| ... | ... | @@ -177,8 +177,8 @@ class Userteams < Spinach::FeatureSteps |
| 177 | 177 | And 'I select user "John" from list with role "Reporter"' do |
| 178 | 178 | user = User.find_by_name("John") |
| 179 | 179 | within "#team_members" do |
| 180 | - select user.name, :from => "user_ids" | |
| 181 | - select "Reporter", :from => "default_project_access" | |
| 180 | + select "#{user.name} (#{user.email})", from: "user_ids" | |
| 181 | + select "Reporter", from: "default_project_access" | |
| 182 | 182 | end |
| 183 | 183 | click_button "Add" |
| 184 | 184 | end |
| ... | ... | @@ -213,8 +213,8 @@ class Userteams < Spinach::FeatureSteps |
| 213 | 213 | |
| 214 | 214 | When 'I submit form with selected project and max access' do |
| 215 | 215 | within "#assign_projects" do |
| 216 | - select @project.name_with_namespace, :from => "project_ids" | |
| 217 | - select "Reporter", :from => "greatest_project_access" | |
| 216 | + select @project.name_with_namespace, from: "project_ids" | |
| 217 | + select "Reporter", from: "greatest_project_access" | |
| 218 | 218 | end |
| 219 | 219 | click_button "Add" |
| 220 | 220 | end | ... | ... |