Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
c94895d
Merge pull request #110 from EngSwCIC/develop
icaronr Mar 30, 2021
7b672f5
fix gemfile and migrations
icaronr Mar 30, 2021
2611773
fix(gemfile): remove conflict
thlmenezes Apr 15, 2021
4176375
feat(env): create .env file
thlmenezes Apr 15, 2021
7e40cee
feat(docker): create config
thlmenezes Apr 15, 2021
73ec493
Adiciona BDD para funcionalidades de preferencia
viniciusgarreto Apr 22, 2021
7dc16d2
Merge branch 'develop' of https://github.com/LeonardoRibas/monitoriaC…
viniciusgarreto Apr 22, 2021
62cbb01
Merge pull request #1 from LeonardoRibas/preferencia-bdd
LeonardoRibas Apr 22, 2021
191bffc
Adiciona /coverage ao gitiginore
LeonardoRibas May 3, 2021
cd76447
Adiciona atributo professor_auxiliar à turma
LeonardoRibas May 3, 2021
29c29b2
Adiciona campo para escolher professor auxiliar
LeonardoRibas May 3, 2021
da0c636
Adiciona acesso à turma ao professor auxiliar
LeonardoRibas May 3, 2021
52a3e3c
Adiciona acesso à monitorias ao professor auxiliar
LeonardoRibas May 3, 2021
b76b402
Atualiza a feature de cadastrar turmas
LeonardoRibas May 3, 2021
fd777a9
Add campo Professor Auxiliar à edição da turma
LeonardoRibas May 3, 2021
4d02760
feat: Inicia lógica de média de prioridade
viniciusgarreto May 4, 2021
922c5e9
fix: lógica de média
viniciusgarreto May 5, 2021
52579f7
feat: implementa teste de média de preferências
viniciusgarreto May 5, 2021
0f58012
✅ Add new tests to monitoria
mayarachew May 6, 2021
67e9132
refactor: Altera features
viniciusgarreto May 6, 2021
c55fed7
refactor: Melhora os testes BDD
viniciusgarreto May 8, 2021
02f19d3
🐛 Arruma os textes do RSPEC
mayarachew May 8, 2021
c649d3a
Merge branch 'test/monitoria' of https://github.com/LeonardoRibas/mon…
viniciusgarreto May 8, 2021
453e687
merge: com branch de testes
viniciusgarreto May 8, 2021
56958a2
Merge pull request #3 from LeonardoRibas/refactor/features-bdd
viniciusgarreto May 8, 2021
2a4450e
refactor: cucumber test
viniciusgarreto May 17, 2021
7c3acd8
Diminui complexidade do update de monitorias
LeonardoRibas May 17, 2021
4256e9e
Corrige testes
LeonardoRibas May 17, 2021
e49e549
fix: Corrige teste de update
viniciusgarreto May 18, 2021
aad431c
refactor: Diminui complexidade
viniciusgarreto May 18, 2021
ae1c6e2
Refatora e documenta
LeonardoRibas May 21, 2021
558c368
Muda o tipo de prioridade
LeonardoRibas May 21, 2021
e742795
Testa o método all_prioridades
LeonardoRibas May 21, 2021
2f469b7
Gera documentação
LeonardoRibas May 21, 2021
58839a3
merge: refactor
viniciusgarreto May 22, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .env-sample
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
DB_USER=
DB_PASSWORD=
DB_HOST=#url or container name
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# If you find yourself ignoring temporary files generated by your text editor
# or operating system, you probably want to add a global ignore instead:
# git config --global core.excludesfile '~/.gitignore_global'

.env
# Ignore bundler config.
/.bundle

Expand Down Expand Up @@ -64,4 +64,6 @@
# .idea/misc.xml
# *.ipr

/coverage

# End of https://www.gitignore.io/api/ruby,rails,rubymine
13 changes: 13 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
FROM ruby:2.7.2

RUN apt-get update -qq && apt-get install -y -qq --no-install-recommends nodejs

WORKDIR /opt/monitoria_cic

COPY Gemfile Gemfile.lock ./

RUN bundle install

EXPOSE ${PORT:-3000}

CMD rails server -p ${PORT:-3000} -b "0.0.0.0"
7 changes: 3 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
source 'https://rubygems.org'
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby '2.7.2'
ruby '2.7.2'

gem "rubycritic", require: false
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 5.2.0'
# Use postgresql as the database for Active Record
Expand All @@ -27,8 +28,6 @@ gem 'jbuilder', '~> 2.5'
# Use ActiveModel has_secure_password
gem 'bcrypt', '~> 3.1.7'

gem 'webdrivers', '~> 4.0'

# Uses HAML templates
gem 'haml'
gem 'haml-rails'
Expand Down Expand Up @@ -81,7 +80,7 @@ group :test do
gem 'launchy'
gem 'selenium-webdriver'
# Easy installation and use of chromedriver to run system tests with Chrome
gem 'webdrivers'
gem 'webdrivers', '~> 4.0'

# Adds the RSpec stuff
gem 'rspec-rails' # RSpec
Expand Down
Loading