Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-08-01 00:33:13 +0400
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-08-01 00:33:13 +0400
commitbd72c74dab2f97b86f3112306c41aeedb63fea23 (patch)
tree072ba618072aefa170762be3d093c344cc769224 /features
parent394ac378f806db8d521e13709bdd3a3e5550399d (diff)
Fix dashboard tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'features')
-rw-r--r--features/steps/dashboard/dashboard.rb4
-rw-r--r--features/steps/shared/project.rb6
2 files changed, 5 insertions, 5 deletions
diff --git a/features/steps/dashboard/dashboard.rb b/features/steps/dashboard/dashboard.rb
index 706c9babcee..84a480bd7f8 100644
--- a/features/steps/dashboard/dashboard.rb
+++ b/features/steps/dashboard/dashboard.rb
@@ -12,7 +12,7 @@ class Dashboard < Spinach::FeatureSteps
end
Then 'I should see last push widget' do
- page.should have_content "You pushed to new_design"
+ page.should have_content "You pushed to fix"
page.should have_link "Create Merge Request"
end
@@ -23,7 +23,7 @@ class Dashboard < Spinach::FeatureSteps
Then 'I see prefilled new Merge Request page' do
current_path.should == new_project_merge_request_path(@project)
find("#merge_request_target_project_id").value.should == @project.id.to_s
- find("#merge_request_source_branch").value.should == "new_design"
+ find("#merge_request_source_branch").value.should == "fix"
find("#merge_request_target_branch").value.should == "master"
end
diff --git a/features/steps/shared/project.rb b/features/steps/shared/project.rb
index e31d349a45f..655840f447d 100644
--- a/features/steps/shared/project.rb
+++ b/features/steps/shared/project.rb
@@ -26,8 +26,8 @@ module SharedProject
data = {
before: "0000000000000000000000000000000000000000",
- after: "0220c11b9a3e6c69dc8fd35321254ca9a7b98f7e",
- ref: "refs/heads/new_design",
+ after: "6d394385cf567f80a8fd85055db1ab4c5295806f",
+ ref: "refs/heads/fix",
user_id: @user.id,
user_name: @user.name,
repository: {
@@ -49,7 +49,7 @@ module SharedProject
Then 'I should see project "Shop" activity feed' do
project = Project.find_by(name: "Shop")
- page.should have_content "#{@user.name} pushed new branch new_design at #{project.name_with_namespace}"
+ page.should have_content "#{@user.name} pushed new branch fix at #{project.name_with_namespace}"
end
Then 'I should see project settings' do