fixing conflicts in merge
This commit is contained in:
parent
7048fa6d50
commit
ac8cd8368e
1 changed files with 12 additions and 0 deletions
12
spec/javascripts/aspect-spec.js
Normal file
12
spec/javascripts/aspect-spec.js
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
describe("Diaspora.Aspects", function() {
|
||||
beforeEach(function() {
|
||||
spec.loadFixture("aspects_index");
|
||||
});
|
||||
|
||||
|
||||
describe("edit aspect name", function() {
|
||||
it("it should ", function() {
|
||||
var startName = $("a [data-aspect_id=13]").text();
|
||||
});
|
||||
});
|
||||
});
|
||||
Loading…
Reference in a new issue