3d7194f011
The good: - You can do a merge request for a forked commit and it will merge properly (i.e. it does work). - Push events take into account merge requests on forked projects - Tests around merge_actions now present, spinach, and other rspec tests - Satellites now clean themselves up rather then recreate The questionable: - Events only know about target projects - Project's merge requests only hold on to MR's where they are the target - All operations performed in the satellite The bad: - Duplication between project's repositories and satellites (e.g. commits_between) (for reference: http://feedback.gitlab.com/forums/176466-general/suggestions/3456722-merge-requests-between-projects-repos) Fixes: Make test repos/satellites only create when needed -Spinach/Rspec now only initialize test directory, and setup stubs (things that are relatively cheap) -project_with_code, source_project_with_code, and target_project_with_code now create/destroy their repos individually -fixed remote removal -How to merge renders properly -Update emails to show project/branches -Edit MR doesn't set target branch -Fix some failures on editing/creating merge requests, added a test -Added back a test around merge request observer -Clean up project_transfer_spec, Remove duplicate enable/disable observers -Ensure satellite lock files are cleaned up, Attempted to add some testing around these as well -Signifant speed ups for tests -Update formatting ordering in notes_on_merge_requests -Remove wiki schema update Fixes for search/search results -Search results was using by_project for a list of projects, updated this to use in_projects -updated search results to reference the correct (target) project -udpated search results to print both sides of the merge request Change-Id: I19407990a0950945cc95d62089cbcc6262dab1a8
51 lines
1.4 KiB
Ruby
51 lines
1.4 KiB
Ruby
require 'spec_helper'
|
|
|
|
describe "Profile account page" do
|
|
before(:each) { enable_observers }
|
|
after(:each) {disable_observers}
|
|
let(:user) { create(:user) }
|
|
|
|
before do
|
|
login_as :user
|
|
end
|
|
|
|
describe "when signup is enabled" do
|
|
before do
|
|
Gitlab.config.gitlab.stub(:signup_enabled).and_return(true)
|
|
visit account_profile_path
|
|
end
|
|
|
|
it { page.should have_content("Remove account") }
|
|
|
|
it "should delete the account", js: true do
|
|
expect { click_link "Delete account" }.to change {User.count}.by(-1)
|
|
current_path.should == new_user_session_path
|
|
end
|
|
end
|
|
|
|
describe "when signup is enabled and user has a project" do
|
|
before do
|
|
Gitlab.config.gitlab.stub(:signup_enabled).and_return(true)
|
|
@project = create(:project, namespace: @user.namespace)
|
|
@project.team << [@user, :master]
|
|
visit account_profile_path
|
|
end
|
|
it { page.should have_content("Remove account") }
|
|
|
|
it "should not allow user to delete the account" do
|
|
expect { click_link "Delete account" }.not_to change {User.count}.by(-1)
|
|
end
|
|
end
|
|
|
|
describe "when signup is disabled" do
|
|
before do
|
|
Gitlab.config.gitlab.stub(:signup_enabled).and_return(false)
|
|
visit account_profile_path
|
|
end
|
|
|
|
it "should not have option to remove account" do
|
|
page.should_not have_content("Remove account")
|
|
current_path.should == account_profile_path
|
|
end
|
|
end
|
|
end
|