Skip to content

Commit

Permalink
Merge pull request #78 from koppor/hotfix
Browse files Browse the repository at this point in the history
Hotfix
  • Loading branch information
danielabajirov authored Jan 10, 2021
2 parents ce1cc15 + bf5c71b commit 388e544
Show file tree
Hide file tree
Showing 9 changed files with 513 additions and 422 deletions.
2 changes: 1 addition & 1 deletion cypress/fixtures/CounterAdrsAllRepos.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"counter": "42"
"counter": "4"
}
2 changes: 1 addition & 1 deletion cypress/fixtures/CounterAdrsPerRepo.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"counter": "14"
"counter": "4"
}
2 changes: 1 addition & 1 deletion cypress/fixtures/CounterDiffAllRepos.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"counter": "30"
"counter": "4"
}
2 changes: 1 addition & 1 deletion cypress/fixtures/CounterDiffPerRepo.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"counter": "8"
"counter": "4"
}
1 change: 1 addition & 0 deletions cypress/integration/adrManagerTest/EmpiricalAnalysis.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ context("Should test empirical add and open function of adr-manager", () => {
cy.get('[data-cy=addRepo]').click();

cy.intercept('GET', '**/user/repos**').as('getRepos');
cy.wait(5000);
cy.wait('@getRepos').its('response.statusCode').should('eq', 200);
cy.writeFile('cypress/fixtures/CounterDiffPerRepo.json', { counter: "0" });
cy.writeFile('cypress/fixtures/CounterAdrsPerRepo.json', { counter: "0" });
Expand Down
160 changes: 81 additions & 79 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 8 additions & 7 deletions src/components/DialogCommit.vue
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,8 @@ export default {
type: Boolean,
required: false,
default: false
}
},
repo: String
},
data: () => ({
showDialog: false,
Expand Down Expand Up @@ -285,7 +286,7 @@ export default {
setUserInfo() {
getUserName(this.currUser)
.then((res) => {
this.name = res.name;
this.name = res.login;
})
.catch((error) => {
this.errorRequest = true;
Expand All @@ -309,22 +310,22 @@ export default {
},
setRepoInfo() {
let repoInfos = store.getRepoInfoForCommit();
let repoInfos = store.getRepoInfoForCommit(this.repo);
this.currUser = repoInfos.userName;
this.currRepo = repoInfos.repoName;
this.branch = repoInfos.activeBranch;
},
setFilesForCommit() {
this.changedFiles = store.changedFilesInRepo();
this.changedFiles = store.changedFilesInRepo(this.repo);
if (this.changedFiles.length > 0) {
this.changedFileBool = true;
}
this.newFiles = store.newFilesInRepo();
this.newFiles = store.newFilesInRepo(this.repo);
if (this.newFiles.length > 0) {
this.newFileBool = true;
}
this.deletedFiles = store.deletedFilesInRepo();
this.deletedFiles = store.deletedFilesInRepo(this.repo);
if (this.deletedFiles.length > 0) {
this.deletedFileBool = true;
}
Expand Down Expand Up @@ -542,7 +543,7 @@ export default {
}, 60000);
this.loading = false;
if (!this.errorRequest) {
store.updateLocalStorageAfterCommit(this.filesPushed);
store.updateLocalStorageAfterCommit(this.filesPushed, this.repo);
this.$alert("Successfully pushed", "Success", "success");
}
})
Expand Down
2 changes: 1 addition & 1 deletion src/components/FileExplorer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<v-list-item-title v-text="repo.name"></v-list-item-title>
</v-list-item-content>
<DialogCommit
v-bind:repo="{ name: repo.name }"
v-bind:repo="repo.name"
v-if="repo.fileType === 'repo'"
>
<template v-slot:activator="{ on, attrs }">
Expand Down
Loading

0 comments on commit 388e544

Please sign in to comment.