marty 9.3.0 → 9.3.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.gemignore +2 -0
- data/.gitignore +3 -0
- data/.rubocop.yml +34 -1
- data/Gemfile +1 -0
- data/Rakefile +10 -0
- data/app/assets/javascripts/marty/cable.js +21 -9
- data/app/channels/application_cable/connection.rb +1 -1
- data/app/channels/marty/notification_channel.rb +4 -1
- data/app/components/marty/api_config_view.rb +1 -1
- data/app/components/marty/api_log_view.rb +1 -1
- data/app/components/marty/auth_app.rb +8 -1
- data/app/components/marty/auth_app/client/auth_app.js +6 -0
- data/app/components/marty/data_grid_view.rb +6 -6
- data/app/components/marty/extras/misc.rb +1 -1
- data/app/components/marty/log_view.rb +1 -1
- data/app/components/marty/posting_grid.rb +1 -1
- data/app/components/marty/script_form.rb +3 -3
- data/app/components/marty/user_view.rb +1 -1
- data/app/components/marty/users/user_view.rb +1 -1
- data/app/controllers/marty/application_controller.rb +7 -7
- data/app/controllers/marty/delayed_job_controller.rb +7 -4
- data/app/controllers/marty/diagnostic/controller.rb +1 -1
- data/app/controllers/marty/job_controller.rb +2 -2
- data/app/models/marty/api_auth.rb +3 -3
- data/app/models/marty/api_config.rb +1 -1
- data/app/models/marty/base_rule.rb +1 -1
- data/app/models/marty/config.rb +5 -5
- data/app/models/marty/data_grid.rb +3 -3
- data/app/models/marty/delorean_rule.rb +2 -2
- data/app/models/marty/grid_index_boolean.rb +2 -2
- data/app/models/marty/grid_index_int4range.rb +1 -1
- data/app/models/marty/grid_index_integer.rb +1 -1
- data/app/models/marty/grid_index_numrange.rb +1 -1
- data/app/models/marty/grid_index_string.rb +1 -1
- data/app/models/marty/import_type.rb +2 -2
- data/app/models/marty/notifications/notification.rb +2 -1
- data/app/models/marty/posting.rb +6 -6
- data/app/models/marty/posting_type.rb +2 -2
- data/app/models/marty/promise.rb +4 -3
- data/app/models/marty/script.rb +7 -7
- data/app/models/marty/tag.rb +5 -5
- data/app/models/marty/token.rb +1 -1
- data/app/models/marty/user.rb +11 -10
- data/app/models/marty/user_role.rb +2 -2
- data/app/models/marty/vw_promise.rb +2 -1
- data/app/services/marty/background_job/update_schedule.rb +1 -1
- data/app/services/marty/data_grid/constraint.rb +4 -3
- data/app/services/marty/jobs/schedule.rb +2 -2
- data/lib/marty/data_change.rb +1 -1
- data/lib/marty/data_conversion.rb +1 -1
- data/lib/marty/migrations.rb +2 -2
- data/lib/marty/rpc_call.rb +2 -1
- data/lib/marty/rule_script_set.rb +1 -3
- data/lib/marty/util.rb +2 -2
- data/lib/marty/version.rb +1 -1
- data/lib/tasks/scripts_tasks.rake +2 -2
- data/marty.gemspec +5 -1
- data/spec/controllers/job_controller_spec.rb +7 -7
- data/spec/controllers/rpc_controller_spec.rb +8 -8
- data/spec/controllers/rpc_import_spec.rb +3 -3
- data/spec/features/data_blame_report_spec.rb +1 -1
- data/spec/features/data_grid_spec.rb +101 -3
- data/spec/features/enum_values_report_spec.rb +1 -1
- data/spec/features/extjs_spec.rb +1 -1
- data/spec/features/jobs_dashboard_spec.rb +2 -2
- data/spec/features/log_view_spec.rb +1 -1
- data/spec/features/reporting_spec.rb +3 -3
- data/spec/features/scripting_spec.rb +3 -3
- data/spec/features/scripting_test_spec.rb +3 -3
- data/spec/features/user_list_report_spec.rb +1 -1
- data/spec/fixtures/misc/data_grid_6.txt +9 -0
- data/spec/fixtures/misc/data_grid_7.txt +7 -0
- data/spec/fixtures/misc/data_grid_8.txt +10 -0
- data/spec/fixtures/misc/data_grid_9.txt +10 -0
- data/spec/lib/data_blame_spec.rb +1 -1
- data/spec/lib/data_importer_spec.rb +4 -4
- data/spec/lib/delorean_query_spec.rb +1 -1
- data/spec/lib/logger_spec.rb +1 -1
- data/spec/lib/mcfly_model_spec.rb +2 -2
- data/spec/lib/table_report_spec.rb +1 -1
- data/spec/models/api_auth_spec.rb +2 -2
- data/spec/models/data_grid_spec.rb +3 -3
- data/spec/models/posting_spec.rb +12 -12
- data/spec/models/promise_spec.rb +1 -1
- data/spec/models/rule_spec.rb +1 -1
- data/spec/models/script_spec.rb +1 -1
- data/spec/other/diagnostic/delayed_job_version_spec.rb +1 -1
- data/spec/spec_helper.rb +3 -0
- data/spec/support/netzke.rb +2 -2
- data/spec/support/setup.rb +1 -1
- data/spec/support/simplecov_helper.rb +94 -0
- data/spec/support/users.rb +2 -2
- metadata +8 -3
- data/.gitlab-ci.yml +0 -117
data/spec/support/users.rb
CHANGED
@@ -3,7 +3,7 @@ module Marty; module RSpec; module Users
|
|
3
3
|
(1..2).each do |i|
|
4
4
|
Rails.configuration.marty.roles.each do |role_name|
|
5
5
|
username = "#{role_name}#{i}"
|
6
|
-
next if Marty::User.
|
6
|
+
next if Marty::User.find_by(login: username)
|
7
7
|
|
8
8
|
user = Marty::User.new
|
9
9
|
user.firstname = user.login = username
|
@@ -23,7 +23,7 @@ module Marty; module RSpec; module Users
|
|
23
23
|
end
|
24
24
|
|
25
25
|
def system_user
|
26
|
-
Marty::User.
|
26
|
+
Marty::User.find_by(login: 'marty') # (system_login)
|
27
27
|
end
|
28
28
|
|
29
29
|
def create_user(name)
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: marty
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 9.3.
|
4
|
+
version: 9.3.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Arman Bostani
|
@@ -14,7 +14,7 @@ authors:
|
|
14
14
|
autorequire:
|
15
15
|
bindir: bin
|
16
16
|
cert_chain: []
|
17
|
-
date: 2020-
|
17
|
+
date: 2020-02-06 00:00:00.000000000 Z
|
18
18
|
dependencies:
|
19
19
|
- !ruby/object:Gem::Dependency
|
20
20
|
name: actioncable
|
@@ -277,8 +277,8 @@ extra_rdoc_files: []
|
|
277
277
|
files:
|
278
278
|
- ".eslintignore"
|
279
279
|
- ".eslintrc.js"
|
280
|
+
- ".gemignore"
|
280
281
|
- ".gitignore"
|
281
|
-
- ".gitlab-ci.yml"
|
282
282
|
- ".prettierignore"
|
283
283
|
- ".rspec"
|
284
284
|
- ".rubocop.yml"
|
@@ -1734,6 +1734,10 @@ files:
|
|
1734
1734
|
- spec/fixtures/misc/data_grid_3.txt
|
1735
1735
|
- spec/fixtures/misc/data_grid_4.txt
|
1736
1736
|
- spec/fixtures/misc/data_grid_5.txt
|
1737
|
+
- spec/fixtures/misc/data_grid_6.txt
|
1738
|
+
- spec/fixtures/misc/data_grid_7.txt
|
1739
|
+
- spec/fixtures/misc/data_grid_8.txt
|
1740
|
+
- spec/fixtures/misc/data_grid_9.txt
|
1737
1741
|
- spec/fixtures/misc/grid1_final_data.json
|
1738
1742
|
- spec/fixtures/misc/grid1_final_meta.json
|
1739
1743
|
- spec/fixtures/misc/grid2_final_data.json
|
@@ -1799,6 +1803,7 @@ files:
|
|
1799
1803
|
- spec/support/setup.rb
|
1800
1804
|
- spec/support/shared_connection.rb
|
1801
1805
|
- spec/support/shared_connection_db_helpers.rb
|
1806
|
+
- spec/support/simplecov_helper.rb
|
1802
1807
|
- spec/support/structure_compare.rb
|
1803
1808
|
- spec/support/suite.rb
|
1804
1809
|
- spec/support/users.rb
|
data/.gitlab-ci.yml
DELETED
@@ -1,117 +0,0 @@
|
|
1
|
-
image: 415596832415.dkr.ecr.us-west-2.amazonaws.com/cm_tech/docker-ruby-ci-image:2.6.3-extjs-7-20191018143452
|
2
|
-
|
3
|
-
services:
|
4
|
-
- "postgres:9.6"
|
5
|
-
- "redis:5.0.6-alpine"
|
6
|
-
|
7
|
-
before_script:
|
8
|
-
- time bundle install --jobs $(nproc) --path vendor "${FLAGS[@]}"
|
9
|
-
- cp ./spec/dummy/config/database.ci.yml ./spec/dummy/config/database.yml
|
10
|
-
- RAILS_ENV=test bundle exec rails db:create db:migrate
|
11
|
-
|
12
|
-
.base-test:
|
13
|
-
# Cancel if new commits where pushed
|
14
|
-
interruptible: true
|
15
|
-
# Run only when there is an MR
|
16
|
-
only:
|
17
|
-
- master
|
18
|
-
- merge_requests
|
19
|
-
|
20
|
-
stage: test
|
21
|
-
retry:
|
22
|
-
max: 2
|
23
|
-
when: script_failure
|
24
|
-
|
25
|
-
# Use only the following CI runners
|
26
|
-
tags:
|
27
|
-
- gitlabci-runner-eks-shared-dev
|
28
|
-
|
29
|
-
rubocop:
|
30
|
-
extends: .base-test
|
31
|
-
script:
|
32
|
-
- bundle exec rubocop
|
33
|
-
|
34
|
-
eslint-prettier:
|
35
|
-
extends: .base-test
|
36
|
-
script:
|
37
|
-
- yarn
|
38
|
-
- make lint-js
|
39
|
-
|
40
|
-
rspec (controllers):
|
41
|
-
extends: .base-test
|
42
|
-
script:
|
43
|
-
- bundle exec rspec spec/controllers
|
44
|
-
|
45
|
-
rspec (jobs):
|
46
|
-
extends: .base-test
|
47
|
-
script:
|
48
|
-
- bundle exec rspec spec/jobs
|
49
|
-
|
50
|
-
rspec (lib):
|
51
|
-
extends: .base-test
|
52
|
-
script:
|
53
|
-
- bundle exec rspec spec/lib
|
54
|
-
|
55
|
-
rspec (models):
|
56
|
-
extends: .base-test
|
57
|
-
script:
|
58
|
-
- bundle exec rspec spec/models
|
59
|
-
|
60
|
-
rspec (other):
|
61
|
-
extends: .base-test
|
62
|
-
script:
|
63
|
-
- bundle exec rspec spec/other
|
64
|
-
|
65
|
-
rspec (performance):
|
66
|
-
extends: .base-test
|
67
|
-
script:
|
68
|
-
- bundle exec rspec spec/performance
|
69
|
-
|
70
|
-
rspec (requests):
|
71
|
-
extends: .base-test
|
72
|
-
script:
|
73
|
-
- bundle exec rspec spec/requests
|
74
|
-
|
75
|
-
rspec (services):
|
76
|
-
extends: .base-test
|
77
|
-
script:
|
78
|
-
- bundle exec rspec spec/services
|
79
|
-
|
80
|
-
rspec-features-1:
|
81
|
-
extends: .base-test
|
82
|
-
script:
|
83
|
-
- ln -s /opt/support/extjs /cm_tech/marty/spec/dummy/public/extjs
|
84
|
-
- bundle exec rspec spec/features --tag ~speed
|
85
|
-
|
86
|
-
rspec-features-2:
|
87
|
-
extends: .base-test
|
88
|
-
script:
|
89
|
-
- ln -s /opt/support/extjs /cm_tech/marty/spec/dummy/public/extjs
|
90
|
-
- bundle exec rspec spec/features --tag speed:slow
|
91
|
-
|
92
|
-
rspec-features-3:
|
93
|
-
extends: .base-test
|
94
|
-
script:
|
95
|
-
- ln -s /opt/support/extjs /cm_tech/marty/spec/dummy/public/extjs
|
96
|
-
- bundle exec rspec spec/features --tag speed:super_slow
|
97
|
-
|
98
|
-
cache:
|
99
|
-
key: 'marty_bundler_cache'
|
100
|
-
paths:
|
101
|
-
- vendor/ruby
|
102
|
-
|
103
|
-
variables:
|
104
|
-
BUNDLER_VERSION: "2.0.1"
|
105
|
-
DOCKER_AUTH_CONFIG: '{ "credsStore": "ecr-login" }'
|
106
|
-
GIT_SSL_NO_VERIFY: "true"
|
107
|
-
HEADLESS: "true"
|
108
|
-
HEADLESS_WINDOW_SIZE: "1400,1400"
|
109
|
-
PGTZ: "America/Los_Angeles"
|
110
|
-
POSTGRES_USER: "runner"
|
111
|
-
POSTGRES_PASSWORD: ""
|
112
|
-
MARTY_REDIS_URL: 'localhost:6379/1'
|
113
|
-
RAILS_ENV: "test"
|
114
|
-
RAILS_DUMP_SCHEMA: "false"
|
115
|
-
REPOSITORY_URL: '415596832415.dkr.ecr.us-west-2.amazonaws.com/cm_tech/docker-ruby-ci-image'
|
116
|
-
RSPEC_AUTO_RETRY_JS: "true"
|
117
|
-
|