Software
/
rosa-build
mirror of https://github.com/OpenMandrivaSoftware/rosa-build.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[#345] fix specs; fix project url; fix missing method error

This commit is contained in:
Alexander Machehin 2014-03-18 15:39:58 +06:00
parent 4cf3e931bd
commit 83010eca32
5 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/angularjs/controllers/project_schedule_controller.js vendored
View File

@ -1,6 +1,6 @@
RosaABF.controller('ProjectScheduleController', ['$scope', '$http', function($scope, $http) { RosaABF.controller('ProjectScheduleController', ['$scope', '$http', function($scope, $http) {
// See: Modules::Models::Autostart::AUTOSTART_STATUSES // See: Autostart::AUTOSTART_STATUSES
$scope.statuses = { $scope.statuses = {
'0': 'autostart_statuses.0', '0': 'autostart_statuses.0',
'1': 'autostart_statuses.1', '1': 'autostart_statuses.1',

2
app/models/concerns/event_loggable.rb
View File

@ -26,7 +26,7 @@ module EventLoggable
end end
end end
def destroying_event def log_destroying_event
ActiveSupport::Notifications.instrument(self.class.name, eventable: self) ActiveSupport::Notifications.instrument(self.class.name, eventable: self)
end end
end end

2
app/models/git_hook.rb
View File

@ -65,7 +65,7 @@ class GitHook
end end
def self.process(*args) def self.process(*args)
create_notifications(args.size > 1 ? GitHook.new(*args) : args.first) Feed::Git.create_notifications(args.size > 1 ? GitHook.new(*args) : args.first)
end end
def find_user(user) def find_user(user)

2
app/models/project.rb
View File

@ -161,7 +161,7 @@ class Project < ActiveRecord::Base
def git_project_address auth_user def git_project_address auth_user
opts = default_url_options opts = default_url_options
opts.merge!({user: auth_user.authentication_token, password: ''}) unless self.public? opts.merge!({user: auth_user.authentication_token, password: ''}) unless self.public?
Rails.application.routes.url_helpers.project_url(self.owner.uname, self.name, opts) + '.git' Rails.application.routes.url_helpers.project_url(self.name_with_owner, opts) + '.git'
#path #share by NFS #path #share by NFS
end end

14
spec/models/project_spec.rb
View File

@ -208,17 +208,17 @@ describe Project do
it { repository.platform.platform_arch_settings.should have(2).item } it { repository.platform.platform_arch_settings.should have(2).item }
context 'once_a_12_hours' do context 'once_a_12_hours' do
before { project.update_attributes(autostart_status: Modules::Models::Autostart::ONCE_A_12_HOURS) } before { project.update_attributes(autostart_status: Autostart::ONCE_A_12_HOURS) }
it_should_behave_like 'autostart build_lists', 1, 0, 0 it_should_behave_like 'autostart build_lists', 1, 0, 0
end end
context 'once_a_day' do context 'once_a_day' do
before { project.update_attributes(autostart_status: Modules::Models::Autostart::ONCE_A_DAY) } before { project.update_attributes(autostart_status: Autostart::ONCE_A_DAY) }
it_should_behave_like 'autostart build_lists', 0, 1, 0 it_should_behave_like 'autostart build_lists', 0, 1, 0
end end
context 'once_a_day' do context 'once_a_day' do
before { project.update_attributes(autostart_status: Modules::Models::Autostart::ONCE_A_WEEK) } before { project.update_attributes(autostart_status: Autostart::ONCE_A_WEEK) }
it_should_behave_like 'autostart build_lists', 0, 0, 1 it_should_behave_like 'autostart build_lists', 0, 0, 1
end end
@ -266,20 +266,18 @@ describe Project do
# into main platforms: 2 + 1(hidden) # into main platforms: 2 + 1(hidden)
# into personal platform: 3(main) * 1 # into personal platform: 3(main) * 1
context 'once_a_12_hours' do context 'once_a_12_hours' do
before { project.update_attributes(autostart_status: Modules::Models::Autostart::ONCE_A_12_HOURS) } before { project.update_attributes(autostart_status: Autostart::ONCE_A_12_HOURS) }
it_should_behave_like 'autostart build_lists', 6, 0, 0 it_should_behave_like 'autostart build_lists', 6, 0, 0
end end
context 'once_a_day' do context 'once_a_day' do
before { project.update_attributes(autostart_status: Modules::Models::Autostart::ONCE_A_DAY) } before { project.update_attributes(autostart_status: Autostart::ONCE_A_DAY) }
it_should_behave_like 'autostart build_lists', 0, 6, 0 it_should_behave_like 'autostart build_lists', 0, 6, 0
end end
context 'once_a_day' do context 'once_a_day' do
before { project.update_attributes(autostart_status: Modules::Models::Autostart::ONCE_A_WEEK) } before { project.update_attributes(autostart_status: Autostart::ONCE_A_WEEK) }
it_should_behave_like 'autostart build_lists', 0, 0, 6 it_should_behave_like 'autostart build_lists', 0, 0, 6
end end
end end
end end