Git global setup:
@@ -6,7 +7,7 @@ git config --global user.name "#{current_user.name}"
git config --global user.email "#{current_user.email}"
eos
%>
- <%= raw Albino.colorize(setup_str, :bash) %>
+ <%= raw bash_lexer.highlight(setup_str) %>
Next steps:
@@ -21,7 +22,7 @@ git remote add origin #{@project.url_to_repo}
git push -u origin master
eos
%>
- <%= raw Albino.colorize(repo_setup_str, :bash) %>
+ <%= raw bash_lexer.highlight(repo_setup_str) %>
Existing Git Repo?
@@ -31,7 +32,7 @@ git remote add origin #{@project.url_to_repo}
git push -u origin master
eos
%>
- <%= raw Albino.colorize(exist_repo_setup_str, :bash) %>
+ <%= raw bash_lexer.highlight(exist_repo_setup_str) %>
Remove this project?
diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml
index 0fd9c8ea..85019ecb 100644
--- a/app/views/projects/show.html.haml
+++ b/app/views/projects/show.html.haml
@@ -1,3 +1,23 @@
%div
- %div#tree-holder
- = render :partial => "tree", :locals => {:repo => @repo, :commit => @commit, :tree => @commit.tree}
+ %h2.left History
+ .right
+ = form_tag project_path(@project), :method => :get do
+ .span-2
+ = radio_button_tag :view, "recent", (params[:view] || "recent") == "recent", :onclick => "this.form.submit()", :id => "recent_view"
+ = label_tag "recent_view","Recent"
+ .span-2
+ = radio_button_tag :view, "day", params[:view] == "day", :onclick => "this.form.submit()", :id => "day_view"
+ = label_tag "day_view","Today"
+ .span-2
+ = radio_button_tag :view, "week", params[:view] == "week", :onclick => "this.form.submit()", :id => "week_view"
+ = label_tag "week_view","Week"
+ .clear
+ %hr
+.span-11
+ %h3 Commits
+ =render "projects/recent_commits"
+
+.span-11.right
+ %h3 Talk
+ =render "projects/recent_messages"
+
diff --git a/app/views/projects/wall.html.haml b/app/views/projects/wall.html.haml
index 479bb3cf..ed22478c 100644
--- a/app/views/projects/wall.html.haml
+++ b/app/views/projects/wall.html.haml
@@ -1 +1,29 @@
+%div.wall_page
+ - if can? current_user, :write_note, @project
+ = render "notes/form"
+ .right
+ = form_tag wall_project_path(@project), :method => :get do
+ .span-2
+ = radio_button_tag :view, "recent", (params[:view] || "recent") == "recent", :onclick => "this.form.submit()", :id => "recent_view"
+ = label_tag "recent_view","Recent"
+ .span-2
+ = radio_button_tag :view, "day", params[:view] == "day", :onclick => "this.form.submit()", :id => "day_view"
+ = label_tag "day_view","Today"
+ .span-2
+ = radio_button_tag :view, "week", params[:view] == "week", :onclick => "this.form.submit()", :id => "week_view"
+ = label_tag "week_view","Week"
+ .span-2
+ = radio_button_tag :view, "all", params[:view] == "all", :onclick => "this.form.submit()", :id => "all_view"
+ = label_tag "all_view","All"
+ .clear
+ %br
+ %hr
= render "notes/notes"
+
+:javascript
+ $(function(){
+ $("#note_note").live("click", function(){
+ $(this).css("height", "100px");
+ $('.attach_holder').show();
+ });
+ });
diff --git a/app/views/projects/wall.js.haml b/app/views/projects/wall.js.haml
new file mode 100644
index 00000000..5b9a34c0
--- /dev/null
+++ b/app/views/projects/wall.js.haml
@@ -0,0 +1,2 @@
+:plain
+ $("#notes-list").html("#{escape_javascript(render(:partial => 'notes/notes_list'))}");
diff --git a/app/views/snippets/_form.html.haml b/app/views/snippets/_form.html.haml
new file mode 100644
index 00000000..571e2b06
--- /dev/null
+++ b/app/views/snippets/_form.html.haml
@@ -0,0 +1,22 @@
+%div
+ = form_for [@project, @snippet] do |f|
+ -if @snippet.errors.any?
+ %ul
+ - @snippet.errors.full_messages.each do |msg|
+ %li= msg
+
+ %table.round-borders
+ %tr
+ %td= f.label :title
+ %td= f.text_field :title, :placeholder => "Example Snippet"
+ %tr
+ %td= f.label :file_name
+ %td= f.text_field :file_name, :placeholder => "example.rb"
+ %tr
+ %td{:colspan => 2}
+ = f.label :content, "Code"
+ %br
+ = f.text_area :content, :style => "height:240px;width:932px;"
+
+ .actions.prepend-top
+ = f.submit 'Save', :class => "lbutton vm"
diff --git a/app/views/snippets/_snippet.html.haml b/app/views/snippets/_snippet.html.haml
new file mode 100644
index 00000000..483ff42c
--- /dev/null
+++ b/app/views/snippets/_snippet.html.haml
@@ -0,0 +1,11 @@
+%tr{ :id => dom_id(snippet), :class => "snippet", :url => project_snippet_path(@project, snippet) }
+ %td
+ = image_tag gravatar_icon(snippet.author.email), :class => "left", :width => 40, :style => "padding:0 5px;"
+ = truncate snippet.author.name, :lenght => 20
+ %td= html_escape snippet.title
+ %td= html_escape snippet.file_name
+ %td
+ - if can?(current_user, :admin_snippet, @project) || snippet.author == current_user
+ = link_to 'Edit', edit_project_snippet_path(@project, snippet), :class => "lbutton positive"
+ - if can?(current_user, :admin_snippet, @project) || snippet.author == current_user
+ = link_to 'Destroy', [@project, snippet], :confirm => 'Are you sure?', :method => :delete, :remote => true, :class => "lbutton delete-snippet negative", :id => "destroy_snippet_#{snippet.id}"
diff --git a/app/views/snippets/edit.html.haml b/app/views/snippets/edit.html.haml
new file mode 100644
index 00000000..f81c0b8b
--- /dev/null
+++ b/app/views/snippets/edit.html.haml
@@ -0,0 +1 @@
+= render "snippets/form"
diff --git a/app/views/snippets/index.html.haml b/app/views/snippets/index.html.haml
new file mode 100644
index 00000000..6e5dbde5
--- /dev/null
+++ b/app/views/snippets/index.html.haml
@@ -0,0 +1,14 @@
+%div
+ - if can? current_user, :write_snippet, @project
+ .left= link_to 'New Snippet', new_project_snippet_path(@project), :class => "lbutton vm"
+
+ %table.round-borders#snippets-table
+ %tr
+ %th Author
+ %th Title
+ %th File name
+ %th
+ = render @snippets
+:javascript
+ $('.delete-snippet').live('ajax:success', function() {
+ $(this).closest('tr').fadeOut(); });
diff --git a/app/views/snippets/new.html.haml b/app/views/snippets/new.html.haml
new file mode 100644
index 00000000..f81c0b8b
--- /dev/null
+++ b/app/views/snippets/new.html.haml
@@ -0,0 +1 @@
+= render "snippets/form"
diff --git a/app/views/snippets/show.html.haml b/app/views/snippets/show.html.haml
new file mode 100644
index 00000000..899950b7
--- /dev/null
+++ b/app/views/snippets/show.html.haml
@@ -0,0 +1,22 @@
+%h2
+ = "Snippet ##{@snippet.id} - #{@snippet.title}"
+
+.view_file
+ .view_file_header
+ %strong
+ = @snippet.file_name
+ %br/
+ .view_file_content
+ :erb
+ <%= raw @snippet.colorize %>
+
+- if can?(current_user, :admin_snippet, @project) || @snippet.author == current_user
+ = link_to 'Edit', edit_project_snippet_path(@project, @snippet), :class => "lbutton positive"
+- if can?(current_user, :admin_snippet, @project) || @snippet.author == current_user
+ = link_to 'Destroy', [@project, @snippet], :confirm => 'Are you sure?', :method => :delete, :class => "lbutton delete-snippet negative", :id => "destroy_snippet_#{@snippet.id}"
+.clear
+%br
+.snippet_notes= render "notes/notes"
+
+.clear
+
diff --git a/app/views/team_members/_show.html.haml b/app/views/team_members/_show.html.haml
index 6d310768..b9a68e6c 100644
--- a/app/views/team_members/_show.html.haml
+++ b/app/views/team_members/_show.html.haml
@@ -1,8 +1,10 @@
- user = member.user
%tr{:id => dom_id(member)}
%td
- = image_tag gravatar_icon(user.email), :class => "left", :width => 40, :style => "padding:0 5px;"
- = truncate user.name, :lenght => 16
+ = link_to image_tag(gravatar_icon(user.email), :class => "left", :width => 40, :style => "padding:0 5px;"), project_team_member_path(@project, member)
+
+ = link_to truncate(user.name, :lenght => 16), project_team_member_path(@project, member)
+
%td= truncate user.email, :lenght => 16
- if can? current_user, :admin_project, @project
= form_for(member, :as => :team_member, :url => project_team_member_path(@project, member)) do |f|
diff --git a/app/views/team_members/show.html.haml b/app/views/team_members/show.html.haml
new file mode 100644
index 00000000..d07c54f8
--- /dev/null
+++ b/app/views/team_members/show.html.haml
@@ -0,0 +1,28 @@
+- user = @team_member.user
+.span-2
+ = image_tag gravatar_icon(user.email), :class => "left", :width => 60, :style => "padding-right:5px;"
+%p
+ %b Name:
+ = user.name
+%p
+ %b Email:
+ = user.email
+
+%br
+
+- unless user.skype.empty?
+ .div
+ %b Skype:
+ = user.skype
+
+- unless user.linkedin.empty?
+ .div
+ %b LinkedIn:
+ = user.linkedin
+
+- unless user.twitter.empty?
+ .div
+ %b Twitter:
+ = user.twitter
+
+
diff --git a/config/initializers/grit_ext.rb b/config/initializers/grit_ext.rb
new file mode 100644
index 00000000..4bd71003
--- /dev/null
+++ b/config/initializers/grit_ext.rb
@@ -0,0 +1,8 @@
+require 'grit'
+require 'pygments'
+require "utils"
+
+Grit::Blob.class_eval do
+ include Utils::FileHelper
+ include Utils::Colorize
+end
diff --git a/config/routes.rb b/config/routes.rb
index acf92536..8a40a8fe 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -13,6 +13,7 @@ Gitlab::Application.routes.draw do
get "errors/gitosis"
get "profile/password", :to => "profile#password"
put "profile/password", :to => "profile#password_update"
+ put "profile/edit", :to => "profile#social_update"
get "profile", :to => "profile#show"
#get "profile/:id", :to => "profile#show"
@@ -38,6 +39,8 @@ Gitlab::Application.routes.draw do
}
end
+
+ resources :snippets
resources :commits
resources :team_members
resources :issues do
diff --git a/db/migrate/20111016183422_create_snippets.rb b/db/migrate/20111016183422_create_snippets.rb
new file mode 100644
index 00000000..9b0bf201
--- /dev/null
+++ b/db/migrate/20111016183422_create_snippets.rb
@@ -0,0 +1,12 @@
+class CreateSnippets < ActiveRecord::Migration
+ def change
+ create_table :snippets do |t|
+ t.string :title
+ t.text :content
+ t.integer :author_id, :null => false
+ t.integer :project_id, :null => false
+
+ t.timestamps
+ end
+ end
+end
diff --git a/db/migrate/20111016193417_add_content_type_to_snippets.rb b/db/migrate/20111016193417_add_content_type_to_snippets.rb
new file mode 100644
index 00000000..511a6793
--- /dev/null
+++ b/db/migrate/20111016193417_add_content_type_to_snippets.rb
@@ -0,0 +1,5 @@
+class AddContentTypeToSnippets < ActiveRecord::Migration
+ def change
+ add_column :snippets, :content_type, :string, :null => false, :default => "txt"
+ end
+end
diff --git a/db/migrate/20111016195506_add_file_name_to_snippets.rb b/db/migrate/20111016195506_add_file_name_to_snippets.rb
new file mode 100644
index 00000000..d378d225
--- /dev/null
+++ b/db/migrate/20111016195506_add_file_name_to_snippets.rb
@@ -0,0 +1,6 @@
+class AddFileNameToSnippets < ActiveRecord::Migration
+ def change
+ add_column :snippets, :file_name, :string
+ remove_column :snippets, :content_type
+ end
+end
diff --git a/db/migrate/20111019212429_add_social_to_user.rb b/db/migrate/20111019212429_add_social_to_user.rb
new file mode 100644
index 00000000..b0ffe536
--- /dev/null
+++ b/db/migrate/20111019212429_add_social_to_user.rb
@@ -0,0 +1,7 @@
+class AddSocialToUser < ActiveRecord::Migration
+ def change
+ add_column :users, :skype, :string
+ add_column :users, :linkedin, :string
+ add_column :users, :twitter, :string
+ end
+end
diff --git a/db/migrate/20111021101550_change_social_fields_in_users.rb b/db/migrate/20111021101550_change_social_fields_in_users.rb
new file mode 100644
index 00000000..6e506c1c
--- /dev/null
+++ b/db/migrate/20111021101550_change_social_fields_in_users.rb
@@ -0,0 +1,14 @@
+class ChangeSocialFieldsInUsers < ActiveRecord::Migration
+ def up
+ remove_column :users, :skype
+ remove_column :users, :linkedin
+ remove_column :users, :twitter
+
+ add_column :users, :skype, :string, {:null => false, :default => ''}
+ add_column :users, :linkedin, :string, {:null => false, :default => ''}
+ add_column :users, :twitter, :string, {:null => false, :default => ''}
+ end
+
+ def down
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index ed37dbbb..cc805990 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
#
# It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20111015154310) do
+ActiveRecord::Schema.define(:version => 20111021101550) do
create_table "issues", :force => true do |t|
t.string "title"
@@ -56,6 +56,16 @@ ActiveRecord::Schema.define(:version => 20111015154310) do
t.integer "owner_id"
end
+ create_table "snippets", :force => true do |t|
+ t.string "title"
+ t.text "content"
+ t.integer "author_id", :null => false
+ t.integer "project_id", :null => false
+ t.datetime "created_at"
+ t.datetime "updated_at"
+ t.string "file_name"
+ end
+
create_table "users", :force => true do |t|
t.string "email", :default => "", :null => false
t.string "encrypted_password", :limit => 128, :default => "", :null => false
@@ -72,6 +82,9 @@ ActiveRecord::Schema.define(:version => 20111015154310) do
t.string "name"
t.boolean "admin", :default => false, :null => false
t.integer "projects_limit", :default => 10
+ t.string "skype", :default => "", :null => false
+ t.string "linkedin", :default => "", :null => false
+ t.string "twitter", :default => "", :null => false
end
add_index "users", ["email"], :name => "index_users_on_email", :unique => true
diff --git a/lib/color.rb b/lib/color.rb
index d5500aca..23feecf4 100644
--- a/lib/color.rb
+++ b/lib/color.rb
@@ -11,6 +11,10 @@ module Color
colorize(text, "32m")
end
+ def yellow(text)
+ colorize(text, "93m")
+ end
+
def command(string)
`#{string}`
if $?.to_i > 0
diff --git a/lib/gitosis.rb b/lib/gitosis.rb
index 4cc5e6e3..cab7da2d 100644
--- a/lib/gitosis.rb
+++ b/lib/gitosis.rb
@@ -27,13 +27,11 @@ class Gitosis
def configure
status = Timeout::timeout(20) do
File.open(File.join(Dir.tmpdir,"gitlabhq-gitosis.lock"), "w+") do |f|
- begin
+ begin
f.flock(File::LOCK_EX)
-
pull
yield(self)
push
-
ensure
f.flock(File::LOCK_UN)
end
diff --git a/lib/utils.rb b/lib/utils.rb
index 6e7460ed..e57121a3 100644
--- a/lib/utils.rb
+++ b/lib/utils.rb
@@ -1,8 +1,51 @@
module Utils
- def self.binary?(string)
- string.each_byte do |x|
- x.nonzero? or return true
+ module FileHelper
+ def binary?(string)
+ string.each_byte do |x|
+ x.nonzero? or return true
+ end
+ false
+ end
+
+ def image?
+ mime_type =~ /image/
+ end
+
+ def text?
+ mime_type =~ /application|text/ && !binary?(data)
+ end
+ end
+
+ module Colorize
+ def colorize
+ system_colorize(data, name)
+ end
+
+ def system_colorize(data, file_name)
+ ft = handle_file_type(file_name)
+ Pygments.highlight(data, :lexer => ft, :options => { :encoding => 'utf-8', :linenos => 'True' })
+ end
+
+ def handle_file_type(file_name, mime_type = nil)
+ if file_name =~ /(\.rb|\.ru|\.rake|Rakefile|\.gemspec|\.rbx|Gemfile)$/
+ :ruby
+ elsif file_name =~ /\.py$/
+ :python
+ elsif file_name =~ /(\.pl|\.scala|\.c|\.cpp|\.java|\.haml|\.html|\.sass|\.scss|\.xml|\.php|\.erb)$/
+ $1[1..-1].to_sym
+ elsif file_name =~ /\.js$/
+ :javascript
+ elsif file_name =~ /\.sh$/
+ :bash
+ elsif file_name =~ /\.coffee$/
+ :coffeescript
+ elsif file_name =~ /\.yml$/
+ :yaml
+ elsif file_name =~ /\.md$/
+ :minid
+ else
+ :text
+ end
end
- false
end
end
diff --git a/spec/factories.rb b/spec/factories.rb
index ea055d1b..cc0cd4e5 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -35,6 +35,12 @@ Factory.add(:issue, Issue) do |obj|
obj.content = Faker::Lorem.sentences
end
+Factory.add(:snippet, Snippet) do |obj|
+ obj.title = Faker::Lorem.sentence
+ obj.file_name = Faker::Lorem.sentence
+ obj.content = Faker::Lorem.sentences
+end
+
Factory.add(:note, Note) do |obj|
obj.note = Faker::Lorem.sentence
end
diff --git a/spec/models/issue_spec.rb b/spec/models/issue_spec.rb
index 23609023..b2d594c9 100644
--- a/spec/models/issue_spec.rb
+++ b/spec/models/issue_spec.rb
@@ -38,5 +38,6 @@ end
# created_at :datetime
# updated_at :datetime
# closed :boolean default(FALSE), not null
+# position :integer default(0)
#
diff --git a/spec/models/snippet_spec.rb b/spec/models/snippet_spec.rb
new file mode 100644
index 00000000..9dab72ca
--- /dev/null
+++ b/spec/models/snippet_spec.rb
@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+describe Snippet do
+ describe "Associations" do
+ it { should belong_to(:project) }
+ it { should belong_to(:author) }
+ end
+
+ describe "Validation" do
+ it { should validate_presence_of(:title) }
+ it { should validate_presence_of(:author_id) }
+ it { should validate_presence_of(:project_id) }
+ it { should validate_presence_of(:file_name) }
+ it { should validate_presence_of(:content) }
+ end
+end
+# == Schema Information
+#
+# Table name: snippets
+#
+# id :integer not null, primary key
+# title :string(255)
+# content :text
+# author_id :integer not null
+# project_id :integer not null
+# created_at :datetime
+# updated_at :datetime
+# file_name :string(255)
+#
+
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 77abe2ca..32fb90a3 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -39,5 +39,8 @@ end
# name :string(255)
# admin :boolean default(FALSE), not null
# projects_limit :integer
+# skype :string
+# linkedin :string
+# twitter :string
#
diff --git a/spec/requests/profile_spec.rb b/spec/requests/profile_spec.rb
index 07fdc4ab..5838f63b 100644
--- a/spec/requests/profile_spec.rb
+++ b/spec/requests/profile_spec.rb
@@ -14,6 +14,22 @@ describe "Profile" do
it { page.should have_content(@user.email) }
end
+ describe "Profile update" do
+ before do
+ visit profile_path
+ fill_in "user_skype", :with => "testskype"
+ fill_in "user_linkedin", :with => "testlinkedin"
+ fill_in "user_twitter", :with => "testtwitter"
+ click_button "Save"
+ @user.reload
+ end
+
+ it { @user.skype.should == 'testskype' }
+ it { @user.linkedin.should == 'testlinkedin' }
+ it { @user.twitter.should == 'testtwitter' }
+ end
+
+
describe "Password update" do
before do
visit profile_password_path
diff --git a/spec/requests/projects_security_spec.rb b/spec/requests/projects_security_spec.rb
index a725a49c..90f88d88 100644
--- a/spec/requests/projects_security_spec.rb
+++ b/spec/requests/projects_security_spec.rb
@@ -82,12 +82,18 @@ describe "Projects" do
end
describe "GET /project_code/blob" do
- it { blob_project_path(@project).should be_allowed_for @u1 }
- it { blob_project_path(@project).should be_allowed_for @u3 }
- it { blob_project_path(@project).should be_denied_for :admin }
- it { blob_project_path(@project).should be_denied_for @u2 }
- it { blob_project_path(@project).should be_denied_for :user }
- it { blob_project_path(@project).should be_denied_for :visitor }
+ before do
+ @commit = @project.commit
+ @path = @commit.tree.contents.select { |i| i.is_a?(Grit::Blob)}.first.name
+ @blob_path = blob_project_path(@project, :commit_id => @commit.id, :path => @path)
+ end
+
+ it { @blob_path.should be_allowed_for @u1 }
+ it { @blob_path.should be_allowed_for @u3 }
+ it { @blob_path.should be_denied_for :admin }
+ it { @blob_path.should be_denied_for @u2 }
+ it { @blob_path.should be_denied_for :user }
+ it { @blob_path.should be_denied_for :visitor }
end
describe "GET /project_code/edit" do
@@ -107,5 +113,14 @@ describe "Projects" do
it { project_issues_path(@project).should be_denied_for :user }
it { project_issues_path(@project).should be_denied_for :visitor }
end
+
+ describe "GET /project_code/snippets" do
+ it { project_snippets_path(@project).should be_allowed_for @u1 }
+ it { project_snippets_path(@project).should be_allowed_for @u3 }
+ it { project_snippets_path(@project).should be_denied_for :admin }
+ it { project_snippets_path(@project).should be_denied_for @u2 }
+ it { project_snippets_path(@project).should be_denied_for :user }
+ it { project_snippets_path(@project).should be_denied_for :visitor }
+ end
end
end
diff --git a/spec/requests/projects_spec.rb b/spec/requests/projects_spec.rb
index 2825a6a9..945c1ea2 100644
--- a/spec/requests/projects_spec.rb
+++ b/spec/requests/projects_spec.rb
@@ -72,7 +72,10 @@ describe "Projects" do
current_path.should == project_path(@project)
end
- it_behaves_like :tree_view
+ it "should beahave like dashboard" do
+ page.should have_content("History")
+ end
+
end
describe "GET /projects/team" do
@@ -134,8 +137,6 @@ describe "Projects" do
it "should show project" do
page.should have_content("Awesome")
end
-
- it_behaves_like :tree_view
end
#describe "DELETE /projects/:id", :js => true do
diff --git a/spec/requests/snippets_spec.rb b/spec/requests/snippets_spec.rb
new file mode 100644
index 00000000..00ae58da
--- /dev/null
+++ b/spec/requests/snippets_spec.rb
@@ -0,0 +1,101 @@
+require 'spec_helper'
+
+describe "Snippets" do
+ let(:project) { Factory :project }
+
+ before do
+ login_as :user
+ project.add_access(@user, :read, :write)
+ end
+
+ describe "GET /snippets" do
+ before do
+ @snippet = Factory :snippet,
+ :author => @user,
+ :project => project
+
+ visit project_snippets_path(project)
+ end
+
+ subject { page }
+
+ it { should have_content(@snippet.title) }
+ it { should have_content(@snippet.project.name) }
+ it { should have_content(@snippet.author.name) }
+
+ describe "Destroy" do
+ before do
+ # admin access to remove snippet
+ @user.users_projects.destroy_all
+ project.add_access(@user, :read, :write, :admin)
+ visit project_snippets_path(project)
+ end
+
+ it "should remove entry" do
+ expect {
+ click_link "destroy_snippet_#{@snippet.id}"
+ }.to change { Snippet.count }.by(-1)
+ end
+ end
+ end
+
+ describe "New snippet" do
+ before do
+ visit project_snippets_path(project)
+ click_link "New Snippet"
+ end
+
+ it "should open new snippet popup" do
+ page.current_path.should == new_project_snippet_path(project)
+ end
+
+ describe "fill in" do
+ before do
+ fill_in "snippet_title", :with => "login function"
+ fill_in "snippet_file_name", :with => "test.rb"
+ fill_in "snippet_content", :with => "def login; end"
+ end
+
+ it { expect { click_button "Save" }.to change {Snippet.count}.by(1) }
+
+ it "should add new snippet to table" do
+ click_button "Save"
+ page.current_path.should == project_snippet_path(project, Snippet.last)
+ page.should have_content "login function"
+ page.should have_content "test.rb"
+ end
+ end
+ end
+
+ describe "Edit snippet" do
+ before do
+ @snippet = Factory :snippet,
+ :author => @user,
+ :project => project
+ visit project_snippets_path(project)
+ click_link "Edit"
+ end
+
+ it "should open edit page" do
+ page.current_path.should == edit_project_snippet_path(project, @snippet)
+ end
+
+ describe "fill in" do
+ before do
+ fill_in "snippet_title", :with => "login function"
+ fill_in "snippet_file_name", :with => "test.rb"
+ fill_in "snippet_content", :with => "def login; end"
+ end
+
+ it { expect { click_button "Save" }.to_not change {Snippet.count} }
+
+ it "should update snippet fields" do
+ click_button "Save"
+
+ page.current_path.should == project_snippet_path(project, @snippet)
+ page.should have_content "login function"
+ page.should have_content "test.rb"
+ end
+ end
+ end
+end
diff --git a/spec/requests/team_members_spec.rb b/spec/requests/team_members_spec.rb
index db7513ae..dd92febf 100644
--- a/spec/requests/team_members_spec.rb
+++ b/spec/requests/team_members_spec.rb
@@ -7,6 +7,15 @@ describe "TeamMembers" do
@project.add_access(@user, :read, :admin)
end
+ describe "View profile" do
+ it "should be available" do
+ visit(team_project_path(@project))
+ find(:xpath, "//table[@id='team-table']//a[1]").click
+ page.should have_content @user.skype
+ page.should_not have_content 'Twitter'
+ end
+ end
+
describe "New Team member", :js => true do
before do
@user_1 = Factory :user
diff --git a/spec/requests/user_security_spec.rb b/spec/requests/user_security_spec.rb
index 3c923870..a27eb1ca 100644
--- a/spec/requests/user_security_spec.rb
+++ b/spec/requests/user_security_spec.rb
@@ -7,10 +7,10 @@ describe "Users Security" do
end
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 be_allowed_for :visitor }
+ #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 }
end
describe "GET /keys" do
diff --git a/spec/support/login.rb b/spec/support/login.rb
index 09f64f9e..462647ab 100644
--- a/spec/support/login.rb
+++ b/spec/support/login.rb
@@ -3,7 +3,8 @@ module LoginMacros
@user = User.create(:email => "user#{User.count}@mail.com",
:name => "John Smith",
:password => "123456",
- :password_confirmation => "123456")
+ :password_confirmation => "123456",
+ :skype => 'user_skype')
if role == :admin
@user.admin = true
diff --git a/spec/support/matchers.rb b/spec/support/matchers.rb
index 953b5356..dcdfa6d5 100644
--- a/spec/support/matchers.rb
+++ b/spec/support/matchers.rb
@@ -21,17 +21,30 @@ RSpec::Matchers.define :be_denied_for do |user|
end
end
+RSpec::Matchers.define :be_404_for do |user|
+ match do |url|
+ include UrlAccess
+ url_404?(user, url)
+ end
+end
+
module UrlAccess
def url_allowed?(user, url)
emulate_user(user)
visit url
- result = (current_path == url)
+ (page.status_code != 404 && current_path != new_user_session_path)
end
def url_denied?(user, url)
emulate_user(user)
visit url
- result = (current_path != url)
+ (page.status_code == 404 || current_path == new_user_session_path)
+ end
+
+ def url_404?(user, url)
+ emulate_user(user)
+ visit url
+ page.status_code == 404
end
def emulate_user(user)
diff --git a/update.rb b/update.rb
index d7eec289..b81a4088 100644
--- a/update.rb
+++ b/update.rb
@@ -2,6 +2,10 @@ root_path = File.expand_path(File.dirname(__FILE__))
require File.join(root_path, "lib", "color")
include Color
+def version
+ File.read("VERSION")
+end
+
#
# ruby ./update.rb development # or test or production (default)
#
@@ -12,15 +16,29 @@ env = if envs.include?(ARGV[0])
"production"
end
-puts green " == Update for ENV=#{env}"
+puts yellow "== RAILS ENV | #{env}"
+current_version = version
+puts yellow "Your version is #{current_version}"
+puts yellow "Check for new version: $ git pull origin 1x"
+`git pull origin 1x` # pull from origin
-# pull from github
-`git pull`
+# latest version
+if version == current_version
+ puts yellow "You have a latest version"
+else
+ puts green "Update to #{version}"
`bundle install`
-# migrate db
+ # migrate db
+if env == "development"
+`bundle exec rake db:migrate RAILS_ENV=development`
+`bundle exec rake db:migrate RAILS_ENV=test`
+else
`bundle exec rake db:migrate RAILS_ENV=#{env}`
+end
+
+ puts green "== Done! Now you can start/restart server"
+end
-puts green " == Done! Now you can start/restart server"