dinislage/ss-calculator
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WIP: Testing with pg in travis...

Browse Source 
Remove /.idea/ folder.
This commit is contained in:
dlage committed 2020-08-20 16:45:31 +01:00
1 parent 270e258f33
commit bf6001ceaa
8 files changed
+1738 -290
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

.gitignore
+1 -1
View File
@@ -106,4 +106,4 @@ yarn-debug.log*
!/storage/.keep !/storage/.keep
# Ignore IJ IDE directory # Ignore IJ IDE directory
.idea /.idea/
.idea/misc.xml
Generated
-11
View File
@@ -1,11 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectRootManager" version="2" languageLevel="JDK_14" default="false" project-jdk-name="ruby-2.6.5-p114" project-jdk-type="RUBY_SDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
<component name="SvnConfiguration">
<configuration>C:\Users\scorp\AppData\Roaming\Subversion</configuration>
<option name="sshConnectionType" value="PRIVATE_KEY" />
<option name="sshExecutablePath" value="C:\Program Files\PuTTY\plink.exe" />
</component>
</project>
.idea/modules.xml
Generated
-8
View File
@@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/ss-calculator.iml" filepath="$PROJECT_DIR$/ss-calculator.iml" />
</modules>
</component>
</project>
.idea/vcs.xml
Generated
-6
View File
@@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
</component>
</project>
.idea/workspace.xml
Generated
-225
View File
@@ -1,225 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="d6389a56-ae12-4279-bc1d-76334fb6e4f6" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/app/views/layouts/_toasts.html.erb" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.travis.yml" beforeDir="false" afterPath="$PROJECT_DIR$/.travis.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Gemfile.lock" beforeDir="false" afterPath="$PROJECT_DIR$/Gemfile.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/javascript/stylesheets/application.scss" beforeDir="false" afterPath="$PROJECT_DIR$/app/javascript/stylesheets/application.scss" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/views/layouts/_content.html.erb" beforeDir="false" afterPath="$PROJECT_DIR$/app/views/layouts/_content.html.erb" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/views/layouts/application.html.erb" beforeDir="false" afterPath="$PROJECT_DIR$/app/views/layouts/application.html.erb" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ss-calculator.iml" beforeDir="false" afterPath="$PROJECT_DIR$/ss-calculator.iml" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="ComposerSettings">
<execution />
</component>
<component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES">
<list>
<option value="SCSS File" />
<option value="ERB File" />
</list>
</option>
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="JupyterTrust" id="208beee3-12a7-44ce-ae1b-be2dfcf34edf" />
<component name="ProjectId" id="1gEj5pXY4HyYZVn27v2Qqe7AFWO" />
<component name="ProjectViewState">
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
</component>
<component name="PropertiesComponent">
<property name="ASKED_ADD_EXTERNAL_FILES" value="true" />
<property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/docker-compose.yml" />
<property name="list.type.of.created.stylesheet" value="SCSS" />
<property name="node.js.detected.package.eslint" value="true" />
<property name="node.js.detected.package.tslint" value="true" />
<property name="node.js.path.for.package.eslint" value="project" />
<property name="node.js.path.for.package.tslint" value="project" />
<property name="node.js.selected.package.eslint" value="(autodetect)" />
<property name="node.js.selected.package.tslint" value="(autodetect)" />
<property name="project.structure.last.edited" value="Project" />
<property name="project.structure.proportion" value="0.15" />
<property name="project.structure.side.proportion" value="0.2" />
<property name="settings.editor.selected.configurable" value="com.leinardi.pycharm.pylint.PylintConfigurable" />
</component>
<component name="RunManager" selected="Docker.docker-compose.yml[db, web]: Compose Deployment">
<configuration default="true" type="ArquillianJUnit" factoryName="" nameIsGenerated="true">
<option name="arquillianRunConfiguration">
<value>
<option name="containerStateName" value="" />
</value>
</option>
<option name="TEST_OBJECT" value="class" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration default="true" type="docker-deploy" factoryName="docker-compose.yml" server-name="Docker">
<deployment type="docker-compose.yml">
<settings>
<option name="services">
<list>
<option value="db" />
<option value="web" />
</list>
</option>
<option name="sourceFilePath" value="docker-compose.yml" />
</settings>
</deployment>
<method v="2" />
</configuration>
<configuration name="docker-compose.yml[db, web]: Compose Build" type="docker-deploy" factoryName="docker-compose.yml" server-name="Docker">
<deployment type="docker-compose.yml">
<settings>
<option name="commandLineOptions" value="--build" />
<option name="services">
<list>
<option value="db" />
<option value="web" />
</list>
</option>
<option name="sourceFilePath" value="docker-compose.yml" />
</settings>
</deployment>
<method v="2" />
</configuration>
<configuration name="docker-compose.yml[db, web]: Compose Deployment" type="docker-deploy" factoryName="docker-compose.yml" server-name="Docker">
<deployment type="docker-compose.yml">
<settings>
<option name="services">
<list>
<option value="db" />
<option value="web" />
</list>
</option>
<option name="sourceFilePath" value="docker-compose.yml" />
</settings>
</deployment>
<method v="2" />
</configuration>
<list>
<item itemvalue="Docker.docker-compose.yml[db, web]: Compose Deployment" />
<item itemvalue="Docker.docker-compose.yml[db, web]: Compose Build" />
</list>
</component>
<component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
<component name="SpringUtil" SPRING_PRE_LOADER_OPTION="true" RAKE_SPRING_PRE_LOADER_OPTION="true" RAILS_SPRING_PRE_LOADER_OPTION="true" />
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
<changelist id="d6389a56-ae12-4279-bc1d-76334fb6e4f6" name="Default Changelist" comment="" />
<created>1597686467739</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1597686467739</updated>
<workItem from="1597686468787" duration="5768000" />
<workItem from="1597747634273" duration="16339000" />
<workItem from="1597855104277" duration="10596000" />
</task>
<task id="LOCAL-00001" summary="Install rails_admin and devise. Start setting it up.">
<created>1597695591871</created>
<option name="number" value="00001" />
<option name="presentableId" value="LOCAL-00001" />
<option name="project" value="LOCAL" />
<updated>1597695591871</updated>
</task>
<task id="LOCAL-00002" summary="First working version with devise+rails_admin">
<created>1597818691547</created>
<option name="number" value="00002" />
<option name="presentableId" value="LOCAL-00002" />
<option name="project" value="LOCAL" />
<updated>1597818691547</updated>
</task>
<task id="LOCAL-00003" summary="Add user model through devise. Add some basic layout. Start testing in travis.">
<created>1597917687436</created>
<option name="number" value="00003" />
<option name="presentableId" value="LOCAL-00003" />
<option name="project" value="LOCAL" />
<updated>1597917687436</updated>
</task>
<task id="LOCAL-00004" summary="Fix tests for admins and users - email key was missing">
<created>1597919999993</created>
<option name="number" value="00004" />
<option name="presentableId" value="LOCAL-00004" />
<option name="project" value="LOCAL" />
<updated>1597919999993</updated>
</task>
<option name="localTasksCounter" value="5" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="3" />
</component>
<component name="VcsManagerConfiguration">
<MESSAGE value="Install rails_admin and devise. Start setting it up." />
<MESSAGE value="First working version with devise+rails_admin" />
<MESSAGE value="Add user model through devise. Add some basic layout. Start testing in travis." />
<MESSAGE value="Fix tests for admins and users - email key was missing" />
<option name="LAST_COMMIT_MESSAGE" value="Fix tests for admins and users - email key was missing" />
</component>
<component name="WindowStateProjectService">
<state x="552" y="178" key="#Docker" timestamp="1597687559241">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="552" y="178" key="#Docker/0.0.1920.1040/-1920.0.1740.1040@0.0.1920.1040" timestamp="1597687559241" />
<state x="440" y="94" key="#Project_Structure" timestamp="1597919623710">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="440" y="94" key="#Project_Structure/0.0.1920.1040/-1920.0.1740.1040@0.0.1920.1040" timestamp="1597919623710" />
<state x="414" y="175" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1597919665273">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="414" y="175" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.0.1920.1040/-1920.0.1740.1040@0.0.1920.1040" timestamp="1597919665273" />
<state x="708" y="322" key="#com.intellij.fileTypes.FileTypeChooser" timestamp="1597832335080">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="708" y="322" key="#com.intellij.fileTypes.FileTypeChooser/0.0.1920.1040/-1920.0.1740.1040@0.0.1920.1040" timestamp="1597832335080" />
<state x="585" y="107" key="CommitChangelistDialog2" timestamp="1597919999422">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="585" y="107" key="CommitChangelistDialog2/0.0.1920.1040/-1920.0.1740.1040@0.0.1920.1040" timestamp="1597919999422" />
<state x="798" y="388" key="DockerComposeFileDialog" timestamp="1597687575523">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="798" y="388" key="DockerComposeFileDialog/0.0.1920.1040/-1920.0.1740.1040@0.0.1920.1040" timestamp="1597687575523" />
<state x="827" y="270" key="EnvironmentVariablesDialog" timestamp="1597687589156">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="827" y="270" key="EnvironmentVariablesDialog/0.0.1920.1040/-1920.0.1740.1040@0.0.1920.1040" timestamp="1597687589156" />
<state x="740" y="275" key="FileChooserDialogImpl" timestamp="1597687573558">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="740" y="275" key="FileChooserDialogImpl/0.0.1920.1040/-1920.0.1740.1040@0.0.1920.1040" timestamp="1597687573558" />
<state x="461" y="165" key="SettingsEditor" timestamp="1597920016664">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="461" y="165" key="SettingsEditor/0.0.1920.1040/-1920.0.1740.1040@0.0.1920.1040" timestamp="1597920016664" />
<state x="552" y="253" key="Vcs.Push.Dialog.v2" timestamp="1597920005606">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="552" y="253" key="Vcs.Push.Dialog.v2/0.0.1920.1040/-1920.0.1740.1040@0.0.1920.1040" timestamp="1597920005606" />
<state x="832" y="364" key="cloudConfig.SelfSettingsDialog" timestamp="1597761380237">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="832" y="364" key="cloudConfig.SelfSettingsDialog/0.0.1920.1040/-1920.0.1740.1040@0.0.1920.1040" timestamp="1597761380237" />
<state x="565" y="130" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser" timestamp="1597694693345">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="565" y="130" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser/0.0.1920.1040/-1920.0.1740.1040@0.0.1920.1040" timestamp="1597694693345" />
<state x="667" y="253" width="585" height="534" key="find.popup" timestamp="1597831549088">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="667" y="253" width="585" height="534" key="find.popup/0.0.1920.1040/-1920.0.1740.1040@0.0.1920.1040" timestamp="1597831549088" />
</component>
</project>
.travis.yml
+12 -2
View File
@@ -7,5 +7,15 @@ services:
- postgresql - postgresql
before_script: before_script:
- cp config/database.yml.travis config/database.yml - cp config/database.yml.travis config/database.yml
- psql -c 'create database travis_ci_test;' -U postgres - bundle exec rake db:create db:test:prepare
- bundle exec rails db:migrate RAILS_ENV=test - bundle exec rails webpacker:compile
cache:
yarn: true
directories:
- node_modules
install:
- bundle install
- nvm install node
- node -v
- npm i -g yarn
- yarn install
package.json
+1
View File
@@ -14,6 +14,7 @@
}, },
"version": "0.1.0", "version": "0.1.0",
"devDependencies": { "devDependencies": {
"jest": "^26.4.1",
"webpack-dev-server": "^3.11.0" "webpack-dev-server": "^3.11.0"
} }
} }
yarn.lock
+1724 -37
View File
File diff suppressed because it is too large. Load diff