Fix procfile and references to new linking

This commit is contained in:
Oliver Günther
2018-06-22 08:23:39 +02:00
parent e0b3fbbe0e
commit 3e55430bc4
6 changed files with 9 additions and 36 deletions
+2 -1
View File
@@ -1,3 +1,4 @@
web: bundle exec rails server -p ${PORT:="8080"} -b ${HOST:="127.0.0.1"} --env ${RAILS_ENV:="development"}
assets: cd frontend && RAILS_ENV=${RAILS_ENV:="development"} npm run webpack-watch
legacy: cd frontend && RAILS_ENV=${RAILS_ENV:="development"} npm run legacy-webpack-watch
angular: npm run serve
worker: bundle exec rake jobs:work
@@ -30,13 +30,9 @@
// rake openproject:plugins:register_frontend
import {NgModule} from "@angular/core";
import {PluginModule as OpenprojectAvatars} from './linked/openproject-avatars/main';
import {PluginModule as OpenprojectCosts} from './linked/openproject-costs/main';
@NgModule({
imports: [
OpenprojectAvatars,
OpenprojectCosts,
],
})
export class LinkedPluginsModule { }
+2 -2
View File
@@ -33,7 +33,7 @@ require 'open_project/assets'
# Otherwise Sprockets cannot find the files that webpack produces.
Rake::Task['assets:precompile']
.clear_prerequisites
.enhance(%w[openproject:plugins:register_frontend assets:compile_environment assets:prepare_op])
.enhance(%w[ assets:compile_environment assets:prepare_op])
namespace :assets do
# In this task, set prerequisites for the assets:precompile task
@@ -42,7 +42,7 @@ namespace :assets do
end
desc 'Prepare locales and angular assets'
task prepare_op: [:angular, :export_locales]
task prepare_op: [:angular, 'openproject:plugins:register_frontend', :export_locales]
desc 'Compile assets with webpack'
task :angular do
+2 -2
View File
@@ -47,12 +47,12 @@ begin
namespace :spec do
desc 'Run core and plugin specs'
RSpec::Core::RakeTask.new(all: [:environment, 'assets:prepare_op']) do |t|
RSpec::Core::RakeTask.new(all: [:environment]) do |t|
t.pattern = [Rails.root.join('spec').to_s] + Plugins::LoadPathHelper.spec_load_paths
end
desc 'Run plugin specs'
RSpec::Core::RakeTask.new(plugins: [:environment, 'assets:prepare_op']) do |t|
RSpec::Core::RakeTask.new(plugins: [:environment]) do |t|
t.pattern = Plugins::LoadPathHelper.spec_load_paths
# in case we want to run plugins' specs and there are none
-23
View File
@@ -31,29 +31,6 @@ require 'json'
namespace :openproject do
namespace :plugins do
namespace :test do
desc 'Runs the plugins unit tests.'
Rake::TestTask.new units: 'db:test:prepare' do |t|
t.libs << 'test'
t.verbose = true
t.test_files = FileList["plugins/#{ENV['NAME'] || '*'}/test/unit/**/*_test.rb"]
end
desc 'Runs the plugins functional tests.'
Rake::TestTask.new functionals: 'db:test:prepare' do |t|
t.libs << 'test'
t.verbose = true
t.test_files = FileList["plugins/#{ENV['NAME'] || '*'}/test/functional/**/*_test.rb"]
end
desc 'Runs the plugins integration tests.'
Rake::TestTask.new integration: 'db:test:prepare' do |t|
t.libs << 'test'
t.verbose = true
t.test_files = FileList["plugins/#{ENV['NAME'] || '*'}/test/integration/**/*_test.rb"]
end
end
desc 'Register plugins from the :opf_plugins bundle group to the frontend'
task register_frontend: [:environment] do
::OpenProject::Plugins::FrontendLinking.regenerate!
+3 -4
View File
@@ -5,10 +5,9 @@
"postinstall": "cd frontend && npm install",
"test": "cd frontend && npm test && cd ..",
"tslint_typechecks": "cd frontend && npm run tslint_typechecks && cd ..",
"karma": "cd frontend && npm run karma && cd ..",
"webpack": "cd frontend && npm run webpack && cd ..",
"webpack-watch": "cd frontend && npm run webpack-watch",
"webpack-watch-with-test": "cd frontend && npm run webpack-watch-with-test"
"serve": "cd frontend && npm run serve",
"legacy-webpack": "cd frontend && npm run webpack && cd ..",
"legacy-webpack-watch": "cd frontend && npm run legacy-webpack-watch"
},
"private": true,
"engines": {