Commit 9844ddd4 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets Committed by randx

Comments cucumber. More refactoring. Cucumber -> branches, tags

parent 1281c122
...@@ -2,9 +2,19 @@ Feature: Browse branches ...@@ -2,9 +2,19 @@ Feature: Browse branches
Background: Background:
Given I signin as a user Given I signin as a user
And I own project "Shop" And I own project "Shop"
And project "Shop" has protected branches
Given I visit project branches page Given I visit project branches page
Scenario: I can see all git branches Scenario: I can see project recent git branches
Then I should see "Shop" recent branches list
Scenario: I can see project all git branches
Given I click link "All"
Then I should see "Shop" all branches list
Scenario: I can see project protected git branches
Given I click link "Protected"
Then I should see "Shop" protected branches list
Scenario: I can download project by branch Scenario: I can download project by branch
......
...@@ -4,4 +4,7 @@ Feature: Comment commit ...@@ -4,4 +4,7 @@ Feature: Comment commit
And I own project "Shop" And I own project "Shop"
Given I visit project commit page Given I visit project commit page
Scenario: I leave a comment for commit @javascript
Scenario: I comment commit
Given I leave a comment like "XML attached"
Then I should see comment "XML attached"
...@@ -5,7 +5,6 @@ Feature: Browse tags ...@@ -5,7 +5,6 @@ Feature: Browse tags
Given I visit project tags page Given I visit project tags page
Scenario: I can see all git tags Scenario: I can see all git tags
Then I should see "Shop" all tags list
Scenario: I can download project by tag Scenario: I can download project by tag
...@@ -35,4 +35,4 @@ Feature: Issues ...@@ -35,4 +35,4 @@ Feature: Issues
Scenario: I comment issue Scenario: I comment issue
Given I visit issue page "Release 0.4" Given I visit issue page "Release 0.4"
And I leave a comment like "XML attached" And I leave a comment like "XML attached"
Then I should see commetn "XML attached" Then I should see comment "XML attached"
Feature: Project
Background:
Given I signin as a user
And I own project "Shop"
And I visit project "Shop" page
Scenario: I should see project activity
Scenario: I edit project
Scenario: I visit attachments
...@@ -7,3 +7,9 @@ Feature: Wiki ...@@ -7,3 +7,9 @@ Feature: Wiki
Scenario: Add new page Scenario: Add new page
Given I create Wiki page Given I create Wiki page
Then I should see newly created wiki page Then I should see newly created wiki page
@javascript
Scenario: I comment wiki page
Given I create Wiki page
And I leave a comment like "XML attached"
Then I should see comment "XML attached"
...@@ -59,3 +59,30 @@ end ...@@ -59,3 +59,30 @@ end
Given /^I visit project tags page$/ do Given /^I visit project tags page$/ do
visit tags_project_repository_path(@project) visit tags_project_repository_path(@project)
end end
Then /^I should see "(.*?)" recent branches list$/ do |arg1|
page.should have_content("Branches")
page.should have_content("master")
end
Then /^I should see "(.*?)" all branches list$/ do |arg1|
page.should have_content("Branches")
page.should have_content("master")
end
Then /^I should see "(.*?)" all tags list$/ do |arg1|
page.should have_content("Tags")
page.should have_content("v1.2.1")
end
Then /^I should see "(.*?)" protected branches list$/ do |arg1|
within "table" do
page.should have_content "stable"
page.should_not have_content "master"
end
end
Given /^project "(.*?)" has protected branches$/ do |arg1|
project = Project.find_by_name(arg1)
project.protected_branches.create(:name => "stable")
end
...@@ -32,15 +32,6 @@ Given /^I visit issue page "(.*?)"$/ do |arg1| ...@@ -32,15 +32,6 @@ Given /^I visit issue page "(.*?)"$/ do |arg1|
visit project_issue_path(issue.project, issue) visit project_issue_path(issue.project, issue)
end end
Given /^I leave a comment like "(.*?)"$/ do |arg1|
fill_in "note_note", :with => arg1
click_button "Add Comment"
end
Then /^I should see commetn "(.*?)"$/ do |arg1|
page.should have_content(arg1)
end
Given /^I submit new issue "(.*?)"$/ do |arg1| Given /^I submit new issue "(.*?)"$/ do |arg1|
fill_in "issue_title", :with => arg1 fill_in "issue_title", :with => arg1
click_button "Submit new issue" click_button "Submit new issue"
......
...@@ -50,6 +50,11 @@ Given /^I write new comment "(.*?)"$/ do |arg1| ...@@ -50,6 +50,11 @@ Given /^I write new comment "(.*?)"$/ do |arg1|
click_button "Add Comment" click_button "Add Comment"
end end
Given /^I visit project "(.*?)" page$/ do |arg1|
project = Project.find_by_name(arg1)
visit project_path(project)
end
Given /^I visit project "(.*?)" network page$/ do |arg1| Given /^I visit project "(.*?)" network page$/ do |arg1|
project = Project.find_by_name(arg1) project = Project.find_by_name(arg1)
visit graph_project_path(project) visit graph_project_path(project)
...@@ -66,3 +71,12 @@ Given /^page should have network graph$/ do ...@@ -66,3 +71,12 @@ Given /^page should have network graph$/ do
page.should have_content "notes_refacto..." page.should have_content "notes_refacto..."
end end
end end
Given /^I leave a comment like "(.*?)"$/ do |arg1|
fill_in "note_note", :with => arg1
click_button "Add Comment"
end
Then /^I should see comment "(.*?)"$/ do |arg1|
page.should have_content(arg1)
end
...@@ -44,4 +44,8 @@ class FakeSatellite ...@@ -44,4 +44,8 @@ class FakeSatellite
end end
end end
class ProtectedBranch
def update_repository
true
end
end
require 'spec_helper'
describe "Issues" do
let(:project) { Factory :project }
let!(:commit) { project.repo.commits.first }
before do
login_as :user
project.add_access(@user, :read, :write)
end
describe "add new note", :js => true do
before do
visit project_commit_path(project, commit)
fill_in "note_note", :with => "I commented this commit"
click_button "Add Comment"
end
it "should conatin new note" do
page.should have_content("I commented this commit")
end
it "should be displayed when i visit this commit again" do
visit project_commit_path(project, commit)
page.should have_content("I commented this commit")
end
end
end
require 'spec_helper'
describe "Repository" do
before do
@user = Factory :user
@project = Factory :project
@project.add_access(@user, :read, :write)
login_with @user
end
describe "GET /:project_name/repository" do
before do
visit project_repository_path(@project)
end
it "should be on projects page" do
current_path.should == project_repository_path(@project)
end
it "should have link to last commit for activities tab" do
page.should have_content(@project.commit.safe_message[0..20])
end
end
describe "GET /:project_name/repository/branches" do
before do
visit branches_project_repository_path(@project)
end
it "should have link to repo activities" do
page.should have_content("Branches")
page.should have_content("master")
end
end
# TODO: Add new repo to seeds with tags list
describe "GET /:project_name/repository/tags" do
before do
visit tags_project_repository_path(@project)
end
it "should have link to repo activities" do
page.should have_content("Tags")
page.should have_content("v1.2.1")
end
end
end
...@@ -7,9 +7,6 @@ describe "Users Security" do ...@@ -7,9 +7,6 @@ describe "Users Security" do
end end
describe "GET /login" do describe "GET /login" do
#it { new_user_session_path.should be_denied_for @u1 }
#it { new_user_session_path.should be_denied_for :admin }
#it { new_user_session_path.should be_denied_for :user }
it { new_user_session_path.should_not be_404_for :visitor } it { new_user_session_path.should_not be_404_for :visitor }
end end
......
require 'spec_helper'
describe "TeamMembers" do
before do
login_as :user
@project = Factory :project
@project.add_access(@user, :read, :admin)
end
describe "Update profile", :js => true do
it "should update user role" do
@project.master_access_for?(@user).should be_true
visit team_project_path(@project)
select "Developer", :from => "team_member_project_access"
@project.master_access_for?(@user).should be_false
@project.dev_access_for?(@user).should be_true
end
end
describe "View profile" do
it "should be available" do
visit(team_project_path(@project))
click_link(@user.name)
page.should have_content @user.skype
page.should_not have_content 'Twitter'
end
end
describe "New Team member" do
before do
@user_1 = Factory :user
visit team_project_path(@project)
click_link "New Team Member"
end
it "should open new team member popup" do
page.should have_content("New Team member")
end
describe "fill in" do
before do
within "#new_team_member" do
select @user_1.name, :from => "team_member_user_id"
select "Reporter", :from => "team_member_project_access"
end
end
it { expect { click_button "Save";sleep(1) }.to change {UsersProject.count}.by(1) }
it "should add new member to table" do
click_button "Save"
@member = UsersProject.last
page.should have_content @user_1.name
@member.reload
@member.project_access.should == UsersProject::REPORTER
end
end
end
describe "Cancel membership" do
it "should cancel membership" do
visit project_team_member_path(@project, @project.users_projects.last)
expect { click_link "Remove from team" }.to change { UsersProject.count }.by(-1)
end
end
end
require 'spec_helper'
describe "Wikis" do
let(:project) { Factory :project }
before do
login_as :user
project.add_access(@user, :read, :write)
end
describe "add new note", :js => true do
before do
visit project_wiki_path(project, :index)
fill_in "Title", :with => 'Test title'
fill_in "Content", :with => '[link test](test)'
click_on "Save"
page.should have_content("Test title")
fill_in "note_note", :with => "Comment on wiki!"
click_button "Add Comment"
end
it "should contain the new note" do
page.should have_content("Comment on wiki!")
end
end
end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment